Skip to content

Commit 8b88434

Browse files
grahamccolemickenscole-hlucperkins
authored
Reconcile differences between mnc action and fhc action (#132)
* ci: fixup fhc disable test grep * ci: never skip the success step * pass GITHUB_CONTEXT to magic-nix-cache * Use bigger runners, clean up yaml from DeterminateSystems/flakehub-cache-action#10 * pnpm update * Regenerate --------- Co-authored-by: Cole Mickens <[email protected]> Co-authored-by: Cole Helbling <[email protected]> Co-authored-by: Cole Mickens <[email protected]> Co-authored-by: Luc Perkins <[email protected]>
1 parent cb3030d commit 8b88434

File tree

8 files changed

+5328
-964
lines changed

8 files changed

+5328
-964
lines changed

.github/workflows/cache-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ "$EXPECT_FLAKEHUB" == "true" ]; then
2020
grep 'Using cache' "${log}"
2121
else
2222
grep 'FlakeHub cache is disabled' "${log}" \
23-
|| grep 'FlakeHub cache initialization failed:' "${log}"
23+
|| grep 'FlakeHub: cache initialized failed' "${log}"
2424
fi
2525

2626
if [ "$EXPECT_GITHUB_CACHE" == "true" ]; then

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ jobs:
128128
success:
129129
runs-on: ubuntu-latest
130130
needs: run-systems
131+
if: always()
131132
steps:
132133
- run: "true"
133134
- run: |

.github/workflows/flakehub-cache.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ jobs:
1010
ACTIONS_STEP_DEBUG: true
1111
runs-on: ${{ matrix.systems.runner }}
1212
permissions:
13-
id-token: "write"
14-
contents: "read"
13+
id-token: write
14+
contents: read
1515
strategy:
1616
matrix:
1717
systems:
18-
- nix-system: "aarch64-darwin"
19-
runner: "macos-latest-xlarge"
20-
- nix-system: "x86_64-darwin"
21-
runner: "macos-13"
22-
- nix-system: "x86_64-linux"
23-
runner: "ubuntu-22.04"
18+
- nix-system: aarch64-darwin
19+
runner: macos-latest-xlarge
20+
- nix-system: x86_64-darwin
21+
runner: macos-latest-xlarge
22+
- nix-system: x86_64-linux
23+
runner: UbuntuLatest32Cores128G
2424
steps:
2525
- uses: actions/checkout@v4
2626
- uses: DeterminateSystems/determinate-nix-action@main

0 commit comments

Comments
 (0)