From 44b58f9514373e2e1e6a81ec9438d5ad26f81edb Mon Sep 17 00:00:00 2001 From: yihuang Date: Thu, 23 Nov 2023 10:54:26 +0800 Subject: [PATCH] Problem: nix 2.14 is not used (#1249) Solution: - remove the workaround --- .github/workflows/build.yml | 20 ++++---------------- .github/workflows/lint.yml | 15 +++------------ .github/workflows/release.yml | 10 ++-------- .github/workflows/test.yml | 10 ++-------- 4 files changed, 11 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19dca56d2c..72f46fc33f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,11 +20,8 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} @@ -56,11 +53,8 @@ jobs: timeout-minutes: 40 steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} @@ -110,11 +104,8 @@ jobs: files: | go.mod go.sum - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} @@ -147,11 +138,8 @@ jobs: with: files: | contracts - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5e422e0dd1..d306264ede 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,11 +24,8 @@ jobs: with: go-version: '^1.20.0' - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} @@ -73,11 +70,8 @@ jobs: **/poetry.lock **/pyproject.toml **/*.py - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} @@ -102,11 +96,8 @@ jobs: files: | *.nix **/*.nix - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1da65dc2dc..2af34340f3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,11 +14,8 @@ jobs: environment: release steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} @@ -55,11 +52,8 @@ jobs: environment: release steps: - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c49a6df66a..cfd942cb9c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,11 +28,8 @@ jobs: docs *.md **/*.md - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} @@ -88,11 +85,8 @@ jobs: docs *.md **/*.md - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: - # pin to nix-2.13 to workaround compability issue of 2.14, - # see: https://github.com/cachix/install-nix-action/issues/161 - install_url: https://releases.nixos.org/nix/nix-2.13.3/install nix_path: nixpkgs=channel:nixos-22.11 extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}