diff --git a/.github/workflows/test-per-system.yml b/.github/workflows/test-per-system.yml index c0686cd..f3550f9 100644 --- a/.github/workflows/test-per-system.yml +++ b/.github/workflows/test-per-system.yml @@ -4,7 +4,7 @@ on: workflow_call: inputs: runs-on: - description: 'GitHub Actions runner to use (e.g., ubuntu-latest, macos-13)' + description: 'GitHub Actions runner to use (e.g., ubuntu-latest, macos-latest)' required: true type: string system: @@ -24,7 +24,7 @@ jobs: simple-build: runs-on: ${{ inputs.runs-on }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 - name: Install Nix uses: ./ with: @@ -40,7 +40,7 @@ jobs: custom-nix-path: runs-on: ${{ inputs.runs-on }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 - name: Install Nix uses: ./ with: @@ -51,7 +51,7 @@ jobs: extra-nix-config: runs-on: ${{ inputs.runs-on }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 - name: Install Nix uses: ./ with: @@ -64,7 +64,7 @@ jobs: flakes: runs-on: ${{ inputs.runs-on }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 - name: Install Nix uses: ./ - run: nix flake show github:NixOS/nixpkgs @@ -72,7 +72,7 @@ jobs: latest-installer: runs-on: ${{ inputs.runs-on }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 - name: Run NAR server run: | curl --location https://github.com/cachix/nar-toolbox/releases/download/v0.1.0/nar-toolbox-${{ inputs.system }} -O @@ -89,7 +89,7 @@ jobs: oldest-supported-installer: runs-on: ${{ inputs.runs-on }} steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 - name: Install Nix uses: ./ with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fb25d14..e974b11 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,10 +45,6 @@ jobs: - runs-on: macos-15-intel system: x86_64-darwin oldest_installer_version: nix-2.18.6 - # macos13 will be retired on 04/12/2025 - - runs-on: macos-13 - system: x86_64-darwin - oldest_installer_version: nix-2.8.0 uses: ./.github/workflows/test-per-system.yml with: runs-on: ${{ matrix.runs-on }} @@ -58,7 +54,7 @@ jobs: act-support: runs-on: ubuntu-latest steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 - run: curl https://raw.githubusercontent.com/nektos/act/master/install.sh | sudo bash - run: docker pull ghcr.io/catthehacker/ubuntu:js-24.04 - run: | diff --git a/.github/workflows/update-nix.yml b/.github/workflows/update-nix.yml index 225a3ac..de5fb8c 100644 --- a/.github/workflows/update-nix.yml +++ b/.github/workflows/update-nix.yml @@ -8,7 +8,7 @@ jobs: update-nix-releases: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Update nix releases env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -30,7 +30,7 @@ jobs: echo "LATEST_NIX=${latest_nix}" >> $GITHUB_ENV sed -i -E "s/nix_version=[0-9.]+/nix_version=${latest_nix}/" ./install-nix.sh - name: Create Pull Request - uses: peter-evans/create-pull-request@v7 + uses: peter-evans/create-pull-request@v8 with: title: "nix: ${{ env.CURRENT_NIX }} -> ${{ env.LATEST_NIX }}" commit-message: "nix: ${{ env.CURRENT_NIX }} -> ${{ env.LATEST_NIX }}" diff --git a/install-nix.sh b/install-nix.sh index 007b399..01bc178 100755 --- a/install-nix.sh +++ b/install-nix.sh @@ -102,7 +102,7 @@ echo "installer options: ${installer_options[*]}" # There is --retry-on-errors, but only newer curl versions support that curl_retries=5 -nix_version=2.32.4 +nix_version=2.33.0 while ! curl -sS -o "$workdir/install" -v --fail -L "${INPUT_INSTALL_URL:-https://releases.nixos.org/nix/nix-${nix_version}/install}"; do sleep 1 ((curl_retries--))