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
This commit is contained in:
Cole Mickens 2024-09-26 13:06:19 -06:00 committed by GitHub
parent 87b14cf437
commit a76a83091c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 8 deletions

View file

@ -17,9 +17,6 @@ grep 'GitHub Action cache is enabled' "${log}"
# Build something. # Build something.
outpath=$(nix-build .github/workflows/cache-tester.nix --argstr seed "$seed") 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. # Wait until it has been pushed succesfully.
found= found=
for ((i = 0; i < 60; i++)); do for ((i = 0; i < 60; i++)); do

View file

@ -70,9 +70,6 @@ jobs:
uses: ./ uses: ./
with: with:
_internal-strict-mode: true _internal-strict-mode: true
- name: Check the cache isn't enabled
run: |
[ $(nix config show substituters) == "https://cache.nixos.org/" ]
run-systems: run-systems:
needs: build needs: build
@ -89,7 +86,7 @@ jobs:
- nix-system: "aarch64-darwin" - nix-system: "aarch64-darwin"
runner: "macos-latest-xlarge" runner: "macos-latest-xlarge"
- nix-system: "x86_64-darwin" - nix-system: "x86_64-darwin"
runner: "macos-12" runner: "macos-13"
- nix-system: "aarch64-linux" - nix-system: "aarch64-linux"
runner: "namespace-profile-default-arm64" runner: "namespace-profile-default-arm64"
- nix-system: "x86_64-linux" - nix-system: "x86_64-linux"

View file

@ -18,7 +18,7 @@ jobs:
- nix-system: "aarch64-darwin" - nix-system: "aarch64-darwin"
runner: "macos-latest-xlarge" runner: "macos-latest-xlarge"
- nix-system: "x86_64-darwin" - nix-system: "x86_64-darwin"
runner: "macos-12" runner: "macos-13"
- nix-system: "x86_64-linux" - nix-system: "x86_64-linux"
runner: "ubuntu-22.04" runner: "ubuntu-22.04"
steps: steps: