From 70f3f10f35a5f6b9312d2e19387bc1f3600882d2 Mon Sep 17 00:00:00 2001 From: Freeman <105403280+F-WRunTime@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:15:02 -0700 Subject: [PATCH 01/11] HOTFIX For breaking nix update for cachix --- .github/workflows/update.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index ff5645199..86fcacdb2 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -30,6 +30,10 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v14.1 with: + # Keep nix at <=2.7 https://github.com/NixOS/nix/issues/6572 + # but >= 2.4 due to ZSTD compression done by cachix >=1.1 https://blog.cachix.org/posts/2022-12-19-zstd-compression/ + # Additional issue when >2.13 due to https://github.com/cachix/cachix-action/issues/138#issuecomment-1448893176 + install_url: https://releases.nixos.org/nix/nix-2.7.0/install extra_nix_config: | substituters = http://cache.nixos.org https://hydra.iohk.io trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= From 9add20748efdaecf695418f41e2c758cc6f09f09 Mon Sep 17 00:00:00 2001 From: Freeman <105403280+F-WRunTime@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:31:28 -0700 Subject: [PATCH 02/11] Update update.yml --- .github/workflows/update.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 86fcacdb2..6b023ef45 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -30,10 +30,7 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v14.1 with: - # Keep nix at <=2.7 https://github.com/NixOS/nix/issues/6572 - # but >= 2.4 due to ZSTD compression done by cachix >=1.1 https://blog.cachix.org/posts/2022-12-19-zstd-compression/ - # Additional issue when >2.13 due to https://github.com/cachix/cachix-action/issues/138#issuecomment-1448893176 - install_url: https://releases.nixos.org/nix/nix-2.7.0/install + install_url: https://releases.nixos.org/nix/nix-2.13.1/install extra_nix_config: | substituters = http://cache.nixos.org https://hydra.iohk.io trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= From 4072901a49d464543bf7fffaf44fc7129034e828 Mon Sep 17 00:00:00 2001 From: Freeman <105403280+F-WRunTime@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:36:41 -0700 Subject: [PATCH 03/11] Update test.yml --- .github/workflows/test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d312943e..3dd51b386 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,12 +14,13 @@ jobs: submodules: recursive - name: Install Nix - uses: cachix/install-nix-action@v14.1 + uses: cachix/install-nix-action@v15 with: + install_url: https://releases.nixos.org/nix/nix-2.13.3/install extra_nix_config: | substituters = http://cache.nixos.org https://hydra.iohk.io trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - install_url: "https://releases.nixos.org/nix/nix-2.3.16/install" + - name: Install Cachix uses: cachix/cachix-action@v10 @@ -47,10 +48,10 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v14.1 with: + install_url: https://releases.nixos.org/nix/nix-2.13.3/install extra_nix_config: | substituters = http://cache.nixos.org https://hydra.iohk.io trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - install_url: "https://releases.nixos.org/nix/nix-2.3.16/install" - name: Install Cachix uses: cachix/cachix-action@v10 From 4f635e2613d1add81152ea0b8f311ba51dbbf141 Mon Sep 17 00:00:00 2001 From: Freeman <105403280+F-WRunTime@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:37:19 -0700 Subject: [PATCH 04/11] Update update.yml --- .github/workflows/update.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 6b023ef45..ad92896fc 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -34,7 +34,6 @@ jobs: extra_nix_config: | substituters = http://cache.nixos.org https://hydra.iohk.io trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - install_url: "https://releases.nixos.org/nix/nix-2.3.16/install" - name: Materialize run: ./nix/rematerialize.sh From 5be615004fee80012161f40981064f552fd43af8 Mon Sep 17 00:00:00 2001 From: Freeman <105403280+F-WRunTime@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:37:56 -0700 Subject: [PATCH 05/11] Update release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f53547682..24bb5927a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,14 +9,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3 with: submodules: recursive - name: Install Nix - uses: cachix/install-nix-action@v14.1 + uses: cachix/install-nix-action@v15 with: - install_url: "https://releases.nixos.org/nix/nix-2.3.16/install" + install_url: https://releases.nixos.org/nix/nix-2.13.3/install - name: Upload release.nix uses: ttuegel/upload-release.nix@v1.0 From 3ef5e34bddebcdef6397fa763e3981b8f318d74c Mon Sep 17 00:00:00 2001 From: Freeman <105403280+F-WRunTime@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:38:49 -0700 Subject: [PATCH 06/11] Update update.yml --- .github/workflows/update.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index ad92896fc..331f1a8f8 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -28,9 +28,9 @@ jobs: submodules: recursive - name: Install Nix - uses: cachix/install-nix-action@v14.1 + uses: cachix/install-nix-action@v15 with: - install_url: https://releases.nixos.org/nix/nix-2.13.1/install + install_url: https://releases.nixos.org/nix/nix-2.13.3/install extra_nix_config: | substituters = http://cache.nixos.org https://hydra.iohk.io trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= From e9814a109f75106591b437dfd491276921abf8b2 Mon Sep 17 00:00:00 2001 From: Freeman <105403280+F-WRunTime@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:39:12 -0700 Subject: [PATCH 07/11] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3dd51b386..9fdf66a01 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3 with: submodules: recursive @@ -46,7 +46,7 @@ jobs: submodules: recursive - name: Install Nix - uses: cachix/install-nix-action@v14.1 + uses: cachix/install-nix-action@v15 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install extra_nix_config: | From 9bfc0dcff36265609167df1bffd191d6d0e3e24c Mon Sep 17 00:00:00 2001 From: Freeman <105403280+F-WRunTime@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:47:04 -0700 Subject: [PATCH 08/11] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9fdf66a01..75c41d667 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: submodules: recursive - name: Install Nix - uses: cachix/install-nix-action@v15 + uses: cachix/install-nix-action@v19 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install extra_nix_config: | @@ -46,7 +46,7 @@ jobs: submodules: recursive - name: Install Nix - uses: cachix/install-nix-action@v15 + uses: cachix/install-nix-action@v19 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install extra_nix_config: | From d0ee5353db84bd9123f3e99755bc6389096141a5 Mon Sep 17 00:00:00 2001 From: Freeman <105403280+F-WRunTime@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:58:46 -0700 Subject: [PATCH 09/11] Update test.yml --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 75c41d667..5f5bf9a14 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,9 +25,9 @@ jobs: - name: Install Cachix uses: cachix/cachix-action@v10 with: - name: runtimeverification - extraPullNames: kore - skipPush: true + name: k-framework + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + skipPush: true - name: Check materialization run: nix-build --arg checkMaterialization true iele-assemble -A project.stack-nix @@ -56,9 +56,9 @@ jobs: - name: Install Cachix uses: cachix/cachix-action@v10 with: - name: runtimeverification - extraPullNames: kore - signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + name: k-framework + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' + skipPush: true - name: Build run: K_OPTS=-Xmx6G nix-build --cores 1 From 53fa2113735f1135bccf5d01f5651479cc88e02a Mon Sep 17 00:00:00 2001 From: F-WRunTime Date: Tue, 28 Feb 2023 15:10:04 -0700 Subject: [PATCH 10/11] updating cachix v12, nix v19, remove sub and trusted from nix actions --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 13 +++---------- .github/workflows/update.yml | 5 +---- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 24bb5927a..55d40e9db 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: submodules: recursive - name: Install Nix - uses: cachix/install-nix-action@v15 + uses: cachix/install-nix-action@v19 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5f5bf9a14..de8d5605d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,14 +16,10 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v19 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - extra_nix_config: | - substituters = http://cache.nixos.org https://hydra.iohk.io - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - + install_url: https://releases.nixos.org/nix/nix-2.13.3/install - name: Install Cachix - uses: cachix/cachix-action@v10 + uses: cachix/cachix-action@v12 with: name: k-framework signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' @@ -49,12 +45,9 @@ jobs: uses: cachix/install-nix-action@v19 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install - extra_nix_config: | - substituters = http://cache.nixos.org https://hydra.iohk.io - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - name: Install Cachix - uses: cachix/cachix-action@v10 + uses: cachix/cachix-action@v12 with: name: k-framework signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 331f1a8f8..ba847cdf8 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -28,12 +28,9 @@ jobs: submodules: recursive - name: Install Nix - uses: cachix/install-nix-action@v15 + uses: cachix/install-nix-action@v19 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install - extra_nix_config: | - substituters = http://cache.nixos.org https://hydra.iohk.io - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - name: Materialize run: ./nix/rematerialize.sh From 46c4194419f3ddb412d58b4c7da3bffaccb83248 Mon Sep 17 00:00:00 2001 From: F-WRunTime Date: Wed, 1 Mar 2023 11:18:56 -0700 Subject: [PATCH 11/11] Updating access token for resource warning limits. Adding back substituters to avoid building GHC more than once" " --- .github/workflows/release.yml | 3 +++ .github/workflows/test.yml | 10 +++++++++- .github/workflows/update.yml | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55d40e9db..ee315a585 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,6 +17,9 @@ jobs: uses: cachix/install-nix-action@v19 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - name: Upload release.nix uses: ttuegel/upload-release.nix@v1.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index de8d5605d..f715afc54 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,11 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v19 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.13.3/install + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + substituters = http://cache.nixos.org https://hydra.iohk.io + trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - name: Install Cachix uses: cachix/cachix-action@v12 @@ -45,6 +49,10 @@ jobs: uses: cachix/install-nix-action@v19 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + substituters = http://cache.nixos.org https://hydra.iohk.io + trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - name: Install Cachix uses: cachix/cachix-action@v12 diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index ba847cdf8..562291913 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -31,6 +31,10 @@ jobs: uses: cachix/install-nix-action@v19 with: install_url: https://releases.nixos.org/nix/nix-2.13.3/install + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + substituters = http://cache.nixos.org https://hydra.iohk.io + trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - name: Materialize run: ./nix/rematerialize.sh