Skip to content

Commit

Permalink
ci workflow: don't check initial substituter list (#90)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
colemickens authored Sep 26, 2024
1 parent 87b14cf commit a76a830
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/cache-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flakehub-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit a76a830

Please sign in to comment.