diff --git a/.github/actions/setup_bazel_nix/action.yml b/.github/actions/setup_bazel_nix/action.yml index 87a2d1802..7e6e6b5c0 100644 --- a/.github/actions/setup_bazel_nix/action.yml +++ b/.github/actions/setup_bazel_nix/action.yml @@ -75,6 +75,7 @@ runs: echo "$RUNNER_ARCH not supported" exit 1 fi + echo "nixVersion=$(cat "${{ github.workspace }}/.nixversion")" | tee -a "$GITHUB_OUTPUT" echo "::endgroup::" - name: Install current Bash on macOS @@ -115,7 +116,7 @@ runs: if: steps.check_inputs.outputs.nixPreinstalled == 'false' uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 with: - install_url: "https://releases.nixos.org/nix/nix-2.25.2/install" + install_url: "https://releases.nixos.org/nix/nix-${{ steps.check_inputs.outputs.nixVersion }}/install" - name: Set $USER if not set shell: bash diff --git a/.github/workflows/reproducible-builds.yml b/.github/workflows/reproducible-builds.yml index bc02b37a5..46df18aeb 100644 --- a/.github/workflows/reproducible-builds.yml +++ b/.github/workflows/reproducible-builds.yml @@ -51,15 +51,16 @@ jobs: - name: Setup dependencies (eccentric) if: matrix.deps == 'eccentric' run: | - version=$(cat .bazelversion) + bazelVersion=$(cat .bazelversion) mkdir -p "$HOME/.local/bin" - curl -fsSL -o "$HOME/.local/bin/bazel" "https://github.com/bazelbuild/bazel/releases/download/$version/bazel-$version-linux-x86_64" + curl -fsSL -o "$HOME/.local/bin/bazel" "https://github.com/bazelbuild/bazel/releases/download/$bazelVersion/bazel-$bazelVersion-linux-x86_64" chmod a+x "$HOME/.local/bin/bazel" echo "$HOME/.local/bin" >> "$GITHUB_PATH" - curl -fsSL -o "$HOME/.local/bin/nix-installer" https://github.com/DeterminateSystems/nix-installer/releases/download/v0.34.0/nix-installer-x86_64-linux # renovate:github-release + nixVersion=$(cat .nixversion) + curl -fsSL -o "$HOME/.local/bin/nix-installer" https://github.com/DeterminateSystems/nix-installer/releases/download/v0.36.2/nix-installer-x86_64-linux # renovate:github-release chmod a+x "$HOME/.local/bin/nix-installer" - "$HOME/.local/bin/nix-installer" install --no-confirm + "$HOME/.local/bin/nix-installer" install --no-confirm --nix-package-url https://releases.nixos.org/nix/nix-$nixVersion/nix-$nixVersion-x86_64-linux.tar.xz - name: Build shell: bash diff --git a/.nixversion b/.nixversion new file mode 100644 index 000000000..40a8d7f12 --- /dev/null +++ b/.nixversion @@ -0,0 +1 @@ +2.25.2