From a76a83091cd8728db8c37312dbdd0eeb1177a6c0 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 26 Sep 2024 13:06:19 -0600
Subject: [PATCH] ci workflow: don't check initial substituter list (#90)

* ci workflow: don't check initial substituter list

* ci workflow: s/macos-12/macos-13/g

* ci push dev shell: s/macos-12/macos-13/g

* 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 ---
 .github/workflows/ci.yml             | 5 +----
 .github/workflows/flakehub-cache.yml | 2 +-
 3 files changed, 2 insertions(+), 8 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
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dfe7eaf..e8d308e 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
@@ -89,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"
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: