From e19e4dc1f4f7f5082637ec45c4b2964241dad314 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Wed, 25 Sep 2024 10:47:10 -0700 Subject: [PATCH 1/4] ci workflow: don't check initial substituter list --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfe7eaf..7f45278 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,9 +70,6 @@ jobs: uses: ./ with: _internal-strict-mode: true - - name: Check the cache isn't enabled - run: | - [ $(nix config show substituters) == "https://cache.nixos.org/" ] run-systems: needs: build From 78a8ddee6697656f30a74a03dd9fb7b0bfb7b001 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 26 Sep 2024 11:38:24 -0700 Subject: [PATCH 2/4] ci workflow: s/macos-12/macos-13/g --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f45278..e8d308e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,7 @@ jobs: - nix-system: "aarch64-darwin" runner: "macos-latest-xlarge" - nix-system: "x86_64-darwin" - runner: "macos-12" + runner: "macos-13" - nix-system: "aarch64-linux" runner: "namespace-profile-default-arm64" - nix-system: "x86_64-linux" From e92964122a96945b2efe8d99a413a46ec2568879 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 26 Sep 2024 11:39:12 -0700 Subject: [PATCH 3/4] ci push dev shell: s/macos-12/macos-13/g --- .github/workflows/flakehub-cache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flakehub-cache.yml b/.github/workflows/flakehub-cache.yml index e88ad9c..08dbdcd 100644 --- a/.github/workflows/flakehub-cache.yml +++ b/.github/workflows/flakehub-cache.yml @@ -18,7 +18,7 @@ jobs: - nix-system: "aarch64-darwin" runner: "macos-latest-xlarge" - nix-system: "x86_64-darwin" - runner: "macos-12" + runner: "macos-13" - nix-system: "x86_64-linux" runner: "ubuntu-22.04" steps: From d6f16e9c129770fda0ad1dd87d78057eece0267f Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 26 Sep 2024 12:02:14 -0700 Subject: [PATCH 4/4] cache-test.sh: only check for upload, not enqueue lines; enqueue log lines not printed for dnixd-subscriber scenario --- .github/workflows/cache-test.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/cache-test.sh b/.github/workflows/cache-test.sh index d6159c9..4d938ac 100755 --- a/.github/workflows/cache-test.sh +++ b/.github/workflows/cache-test.sh @@ -17,9 +17,6 @@ grep 'GitHub Action cache is enabled' "${log}" # Build something. outpath=$(nix-build .github/workflows/cache-tester.nix --argstr seed "$seed") -# Check that the path was enqueued to be pushed to the cache. -grep "Enqueueing.*${outpath}" "${log}" - # Wait until it has been pushed succesfully. found= for ((i = 0; i < 60; i++)); do