From 6ab42ea6f1bc5540919c8be72671c2bf0b178161 Mon Sep 17 00:00:00 2001 From: Bart <11445373+bthomee@users.noreply.github.com> Date: Fri, 3 Jul 2026 17:58:12 -0400 Subject: [PATCH] Update NixOS SHA --- .github/scripts/rename/binary.sh | 2 +- .github/scripts/strategy-matrix/linux.json | 2 +- .github/workflows/publish-docs.yml | 2 +- .github/workflows/reusable-build-test-config.yml | 1 + .github/workflows/reusable-clang-tidy.yml | 2 +- .github/workflows/reusable-upload-recipe.yml | 2 +- cmake/XrplProtobufGo.cmake | 4 ++-- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/scripts/rename/binary.sh b/.github/scripts/rename/binary.sh index 89d884538c..312e10e3f4 100755 --- a/.github/scripts/rename/binary.sh +++ b/.github/scripts/rename/binary.sh @@ -50,6 +50,6 @@ ${SED_COMMAND} -i -E 's@XRPLF/xrpld@XRPLF/rippled@g' BUILD.md ${SED_COMMAND} -i -E 's@xrpld \(`xrpld`\)@xrpld@g' BUILD.md ${SED_COMMAND} -i -E 's@XRPLF/xrpld@XRPLF/rippled@g' CONTRIBUTING.md ${SED_COMMAND} -i -E 's@XRPLF/xrpld@XRPLF/rippled@g' docs/build/install.md - +${SED_COMMAND} -i -E 's@XRPLF/xrpld@XRPLF/rippled@g' cmake/XrplProtobufGo.cmake popd echo "Processing complete." diff --git a/.github/scripts/strategy-matrix/linux.json b/.github/scripts/strategy-matrix/linux.json index 863b910dda..df944d1280 100644 --- a/.github/scripts/strategy-matrix/linux.json +++ b/.github/scripts/strategy-matrix/linux.json @@ -1,5 +1,5 @@ { - "image_tag": "sha-e29b523", + "image_tag": "sha-3d847f2", "configs": { "ubuntu": [ { diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 1ac8d61655..23fc1f9c35 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -41,7 +41,7 @@ env: jobs: build: runs-on: ubuntu-latest - container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-e29b523 + container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d847f2 steps: - name: Checkout repository uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml index 0b88a84017..56d21a95f6 100644 --- a/.github/workflows/reusable-build-test-config.yml +++ b/.github/workflows/reusable-build-test-config.yml @@ -217,6 +217,7 @@ jobs: fi - name: Check Go protobuf bindings are up-to-date + if: ${{ runner.os == 'Linux' }} working-directory: ${{ env.BUILD_DIR }} env: GO_PROTO_DIR: proto/org/xrpl/rpc/v1 diff --git a/.github/workflows/reusable-clang-tidy.yml b/.github/workflows/reusable-clang-tidy.yml index a6bbe669ce..594ace00e8 100644 --- a/.github/workflows/reusable-clang-tidy.yml +++ b/.github/workflows/reusable-clang-tidy.yml @@ -34,7 +34,7 @@ jobs: needs: [determine-files] if: ${{ needs.determine-files.outputs.cpp_changed_files != '' || needs.determine-files.outputs.need_full_run == 'true' }} runs-on: ["self-hosted", "Linux", "X64", "heavy"] - container: "ghcr.io/xrplf/xrpld/nix-debian:sha-e29b523" + container: "ghcr.io/xrplf/xrpld/nix-debian:sha-3d847f2" permissions: contents: read issues: write diff --git a/.github/workflows/reusable-upload-recipe.yml b/.github/workflows/reusable-upload-recipe.yml index feeee0a621..55bc53fadf 100644 --- a/.github/workflows/reusable-upload-recipe.yml +++ b/.github/workflows/reusable-upload-recipe.yml @@ -40,7 +40,7 @@ defaults: jobs: upload: runs-on: ubuntu-latest - container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-e29b523 + container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d847f2 env: REMOTE_NAME: ${{ inputs.remote_name }} CONAN_LOGIN_USERNAME_XRPLF: ${{ secrets.remote_username }} diff --git a/cmake/XrplProtobufGo.cmake b/cmake/XrplProtobufGo.cmake index 380c65611a..03ee0ddb5c 100644 --- a/cmake/XrplProtobufGo.cmake +++ b/cmake/XrplProtobufGo.cmake @@ -74,8 +74,8 @@ if(NOT GO_PROTOC OR NOT PROTOC_GEN_GO OR NOT PROTOC_GEN_GO_GRPC) " protoc-gen-go-grpc: ${PROTOC_GEN_GO_GRPC}\n" "Enter the Nix environment (nix develop) to get the pinned toolchain, " "or install the plugins manually with:\n" - " go install google.golang.org/protobuf/cmd/protoc-gen-go@latest\n" - " go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest" + " go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.11\n" + " go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.6.2" ) return() endif()