Merge eb500f2aecdb522cf7c2c1b2910c0f5841bf5f50 into 28e92b9732dd5a84fb27df0eb093899caf48cff8

This commit is contained in:
renovate[bot] 2025-02-13 10:50:25 +01:00 committed by GitHub
commit dc1429edf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions

View File

@ -75,6 +75,7 @@ runs:
echo "$RUNNER_ARCH not supported" echo "$RUNNER_ARCH not supported"
exit 1 exit 1
fi fi
echo "nixVersion=$(cat "${{ github.workspace }}/.nixversion")" | tee -a "$GITHUB_OUTPUT"
echo "::endgroup::" echo "::endgroup::"
- name: Install current Bash on macOS - name: Install current Bash on macOS
@ -115,7 +116,7 @@ runs:
if: steps.check_inputs.outputs.nixPreinstalled == 'false' if: steps.check_inputs.outputs.nixPreinstalled == 'false'
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
with: 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 - name: Set $USER if not set
shell: bash shell: bash

View File

@ -51,15 +51,16 @@ jobs:
- name: Setup dependencies (eccentric) - name: Setup dependencies (eccentric)
if: matrix.deps == 'eccentric' if: matrix.deps == 'eccentric'
run: | run: |
version=$(cat .bazelversion) bazelVersion=$(cat .bazelversion)
mkdir -p "$HOME/.local/bin" 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" chmod a+x "$HOME/.local/bin/bazel"
echo "$HOME/.local/bin" >> "$GITHUB_PATH" 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" 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 - name: Build
shell: bash shell: bash

1
.nixversion Normal file
View File

@ -0,0 +1 @@
2.25.2