From 6a174c65c28d9594d0bc855869c0c0d833873e71 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:15:21 +1000 Subject: [PATCH 1/2] .github/workflows: update cachix/install-nix-action to v20 --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/manual-rendering.yml | 2 +- .github/workflows/update-terraform-providers.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 1199a699c74c..de1e85fe6572 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -19,7 +19,7 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 597a5bf1fa3a..a47396e2b445 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 559a290ab396..95c4e59ce9d2 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index fb01d7504b15..1b5c64b45ea9 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index f54553049bb7..907f5b420ac0 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 2808cee9155e..ca7ff52fe231 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v19 + - uses: cachix/install-nix-action@v20 with: nix_path: nixpkgs=channel:nixpkgs-unstable install_url: https://releases.nixos.org/nix/nix-2.13.3/install From 9df748f599da933a7ca8d8fb49cd4dea0d013793 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:16:03 +1000 Subject: [PATCH 2/2] Revert "workflows: pin install-nix-action to use nix 2.13.3" This reverts commit 3563c178ca7d45d028c095b2a3ba35ee28294eea. fixed in cachix/install-nix-action@v20 --- .github/workflows/basic-eval.yml | 2 -- .github/workflows/editorconfig.yml | 1 - .github/workflows/manual-nixos.yml | 1 - .github/workflows/manual-nixpkgs.yml | 1 - .github/workflows/manual-rendering.yml | 1 - .github/workflows/update-terraform-providers.yml | 1 - 6 files changed, 7 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index de1e85fe6572..605d6a30a383 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -20,8 +20,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v20 - with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index a47396e2b445..5dd85ca26f9d 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -33,7 +33,6 @@ jobs: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - name: Checking EditorConfig run: | cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 95c4e59ce9d2..85c7ac2d6929 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -22,7 +22,6 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 1b5c64b45ea9..599840006524 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -22,7 +22,6 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml index 907f5b420ac0..f571bf773fa4 100644 --- a/.github/workflows/manual-rendering.yml +++ b/.github/workflows/manual-rendering.yml @@ -22,7 +22,6 @@ jobs: with: # explicitly enable sandbox extra_nix_config: sandbox = true - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index ca7ff52fe231..4cf798a654bb 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -20,7 +20,6 @@ jobs: - uses: cachix/install-nix-action@v20 with: nix_path: nixpkgs=channel:nixpkgs-unstable - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - name: setup id: setup run: |