Skip to content

Commit dfa52d0

Browse files
authored
.github: switch from actions/cache to actions/{download,upload}-artifact (#1584)
* .github: switch from actions/cache to actions/{download,upload}-artifact * .github: switch from actions/cache... fixup download path * .github: switch from actions/cache... more fixups * .github: switch from actions/cache... more cache->artifact * .github: switch from actions/cache... debug * .github: switch from actions/cache... artifact has a wrapper dir * .github: switch from actions/cache... GHA is really something
1 parent 34017fe commit dfa52d0

File tree

8 files changed

+92
-173
lines changed

8 files changed

+92
-173
lines changed

.github/workflows/build-aarch64-darwin.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@ name: Build aarch64 Darwin
22

33
on:
44
workflow_call:
5-
inputs:
6-
cache-key:
7-
type: string
8-
required: false
9-
default: aarch64-darwin-artifacts-${{ github.sha }}
105

116
jobs:
127
build-aarch64-darwin:
138
name: Build aarch64 Darwin (static)
149
runs-on: namespace-profile-mac-m2-12c28g
15-
concurrency: ${{ inputs.cache-key }}
1610
permissions:
1711
id-token: "write"
1812
contents: "read"
@@ -24,9 +18,9 @@ jobs:
2418
- name: Build the installer
2519
run: |
2620
nix build .#packages.aarch64-darwin.nix-installer-static -L
27-
cp result/bin/nix-installer .
28-
- name: Create GitHub cache from build artifacts
29-
uses: actions/cache/save@v4
21+
cp result/bin/nix-installer ./nix-installer-aarch64-darwin
22+
- name: Create GitHub artifacts from build outputs
23+
uses: actions/upload-artifact@v4
3024
with:
31-
path: nix-installer
32-
key: ${{ inputs.cache-key }}
25+
path: nix-installer-aarch64-darwin
26+
name: nix-installer-aarch64-darwin

.github/workflows/build-aarch64-linux.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@ name: Build aarch64 Linux (static)
22

33
on:
44
workflow_call:
5-
inputs:
6-
cache-key:
7-
type: string
8-
required: false
9-
default: aarch64-linux-artifacts-${{ github.sha }}
105

116
jobs:
127
build-aarch64-linux:
138
name: Build aarch64 Linux (static)
149
runs-on: UbuntuLatest32Cores128GArm
15-
concurrency: ${{ inputs.cache-key }}
1610
permissions:
1711
id-token: "write"
1812
contents: "read"
@@ -24,9 +18,9 @@ jobs:
2418
- name: Build the installer
2519
run: |
2620
nix build .#packages.aarch64-linux.nix-installer-static -L
27-
cp result/bin/nix-installer .
28-
- name: Create GitHub cache from build artifacts
29-
uses: actions/cache/save@v4
21+
cp result/bin/nix-installer ./nix-installer-aarch64-linux
22+
- name: Create GitHub artifacts from build outputs
23+
uses: actions/upload-artifact@v4
3024
with:
31-
path: nix-installer
32-
key: ${{ inputs.cache-key }}
25+
path: nix-installer-aarch64-linux
26+
name: nix-installer-aarch64-linux

.github/workflows/build-x86_64-darwin.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@ name: Build x86_64 Darwin
22

33
on:
44
workflow_call:
5-
inputs:
6-
cache-key:
7-
type: string
8-
required: false
9-
default: x86_64-darwin-artifacts-${{ github.sha }}
105

116
jobs:
127
build-x86_64-darwin:
138
name: Build x86_64 Darwin (static)
149
runs-on: namespace-profile-mac-m2-12c28g
15-
concurrency: ${{ inputs.cache-key }}
1610
permissions:
1711
id-token: "write"
1812
contents: "read"
@@ -24,9 +18,9 @@ jobs:
2418
- name: Build the installer
2519
run: |
2620
nix build .#packages.x86_64-darwin.nix-installer-static -L
27-
cp result/bin/nix-installer .
28-
- name: Create GitHub cache from build artifacts
29-
uses: actions/cache/save@v4
21+
cp result/bin/nix-installer ./nix-installer-x86_64-darwin
22+
- name: Create GitHub artifacts from build outputs
23+
uses: actions/upload-artifact@v4
3024
with:
31-
path: nix-installer
32-
key: ${{ inputs.cache-key }}
25+
path: nix-installer-x86_64-darwin
26+
name: nix-installer-x86_64-darwin

.github/workflows/build-x86_64-linux.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@ name: Build x86_64 Linux (static)
22

33
on:
44
workflow_call:
5-
inputs:
6-
cache-key:
7-
type: string
8-
required: false
9-
default: x86_64-linux-artifacts-${{ github.sha }}
105

116
jobs:
127
build-x86_64-linux:
138
name: Build x86_64 Linux (static)
149
runs-on: UbuntuLatest32Cores128G
15-
concurrency: ${{ inputs.cache-key }}
1610
permissions:
1711
id-token: "write"
1812
contents: "read"
@@ -24,9 +18,9 @@ jobs:
2418
- name: Build the installer
2519
run: |
2620
nix build .#packages.x86_64-linux.nix-installer-static -L
27-
cp result/bin/nix-installer .
28-
- name: Create GitHub cache from build artifacts
29-
uses: actions/cache/save@v4
21+
cp result/bin/nix-installer ./nix-installer-x86_64-linux
22+
- name: Create GitHub artifacts from build outputs
23+
uses: actions/upload-artifact@v4
3024
with:
31-
path: nix-installer
32-
key: ${{ inputs.cache-key }}
25+
path: nix-installer-x86_64-linux
26+
name: nix-installer-x86_64-linux

.github/workflows/ci.yml

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,14 @@ jobs:
6565
steps:
6666
- uses: actions/checkout@v4
6767
- name: Restore Github cache artifacts
68-
uses: actions/cache/restore@v4
68+
uses: actions/download-artifact@v4
6969
with:
70-
path: nix-installer
71-
key: x86_64-linux-artifacts-${{ github.sha }}
70+
name: nix-installer-x86_64-linux
7271
- name: Move & set executable
7372
run: |
7473
mkdir install-root
7574
cp nix-installer.sh install-root/nix-installer.sh
76-
mv ./nix-installer install-root/nix-installer-x86_64-linux
75+
mv ./nix-installer-x86_64-linux install-root/
7776
chmod +x install-root/nix-installer-x86_64-linux install-root/nix-installer.sh
7877
- run: sudo apt install fish zsh
7978
- name: Initial install
@@ -183,15 +182,14 @@ jobs:
183182
steps:
184183
- uses: actions/checkout@v4
185184
- name: Restore Github cache artifacts
186-
uses: actions/cache/restore@v4
185+
uses: actions/download-artifact@v4
187186
with:
188-
path: nix-installer
189-
key: x86_64-linux-artifacts-${{ github.sha }}
187+
name: nix-installer-x86_64-linux
190188
- name: Move & set executable
191189
run: |
192190
mkdir install-root
193191
cp nix-installer.sh install-root/nix-installer.sh
194-
mv ./nix-installer install-root/nix-installer-x86_64-linux
192+
mv ./nix-installer-x86_64-linux install-root/
195193
chmod +x install-root/nix-installer-x86_64-linux install-root/nix-installer.sh
196194
- run: sudo apt install fish zsh
197195
- name: Initial install
@@ -307,15 +305,14 @@ jobs:
307305
steps:
308306
- uses: actions/checkout@v4
309307
- name: Restore Github cache artifacts
310-
uses: actions/cache/restore@v4
308+
uses: actions/download-artifact@v4
311309
with:
312-
path: nix-installer
313-
key: x86_64-darwin-artifacts-${{ github.sha }}
310+
name: nix-installer-x86_64-darwin
314311
- name: Move & set executable
315312
run: |
316313
mkdir install-root
317314
cp nix-installer.sh install-root/nix-installer.sh
318-
mv ./nix-installer install-root/nix-installer-x86_64-darwin
315+
mv ./nix-installer-x86_64-darwin install-root/
319316
chmod +x install-root/nix-installer-x86_64-darwin install-root/nix-installer.sh
320317
- run: brew install fish coreutils
321318
- name: Initial install
@@ -397,15 +394,14 @@ jobs:
397394
steps:
398395
- uses: actions/checkout@v4
399396
- name: Restore Github cache artifacts
400-
uses: actions/cache/restore@v4
397+
uses: actions/download-artifact@v4
401398
with:
402-
path: nix-installer
403-
key: aarch64-linux-artifacts-${{ github.sha }}
399+
name: nix-installer-aarch64-linux
404400
- name: Move & set executable
405401
run: |
406402
mkdir install-root
407403
cp nix-installer.sh install-root/nix-installer.sh
408-
mv ./nix-installer install-root/nix-installer-aarch64-linux
404+
mv ./nix-installer-aarch64-linux install-root/
409405
chmod +x install-root/nix-installer-aarch64-linux install-root/nix-installer.sh
410406
- run: sudo apt install -y fish zsh
411407
- name: Initial install
@@ -515,15 +511,14 @@ jobs:
515511
steps:
516512
- uses: actions/checkout@v4
517513
- name: Restore Github cache artifacts
518-
uses: actions/cache/restore@v4
514+
uses: actions/download-artifact@v4
519515
with:
520-
path: nix-installer
521-
key: aarch64-darwin-artifacts-${{ github.sha }}
516+
name: nix-installer-aarch64-darwin
522517
- name: Move & set executable
523518
run: |
524519
mkdir install-root
525520
cp nix-installer.sh install-root/nix-installer.sh
526-
mv ./nix-installer install-root/nix-installer-aarch64-darwin
521+
mv ./nix-installer-aarch64-darwin install-root/
527522
chmod +x install-root/nix-installer-aarch64-darwin install-root/nix-installer.sh
528523
- run: brew install fish coreutils
529524
- name: Initial install
@@ -611,15 +606,14 @@ jobs:
611606
steps:
612607
- uses: actions/checkout@v4
613608
- name: Restore Github cache artifacts
614-
uses: actions/cache/restore@v4
609+
uses: actions/download-artifact@v4
615610
with:
616-
path: nix-installer
617-
key: x86_64-linux-artifacts-${{ github.sha }}
611+
name: nix-installer-x86_64-linux
618612
- name: Move & set executable
619613
run: |
620614
mkdir install-root
621615
cp nix-installer.sh install-root/nix-installer.sh
622-
mv ./nix-installer install-root/nix-installer-x86_64-linux
616+
mv ./nix-installer-x86_64-linux install-root/
623617
chmod +x install-root/nix-installer-x86_64-linux install-root/nix-installer.sh
624618
- name: Initial install
625619
uses: DeterminateSystems/nix-installer-action@main

.github/workflows/release-branches.yml

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,12 @@ permissions:
1717
jobs:
1818
build-x86_64-linux:
1919
uses: ./.github/workflows/build-x86_64-linux.yml
20-
with:
21-
cache-key: release-x86_64-linux-artifacts-${{ github.sha }}
2220
build-aarch64-linux:
2321
uses: ./.github/workflows/build-aarch64-linux.yml
24-
with:
25-
cache-key: release-aarch64-linux-artifacts-${{ github.sha }}
2622
build-x86_64-darwin:
2723
uses: ./.github/workflows/build-x86_64-darwin.yml
28-
with:
29-
cache-key: release-x86_64-darwin-artifacts-${{ github.sha }}
3024
build-aarch64-darwin:
3125
uses: ./.github/workflows/build-aarch64-darwin.yml
32-
with:
33-
cache-key: release-aarch64-darwin-artifacts-${{ github.sha }}
3426

3527
release:
3628
runs-on: ubuntu-latest
@@ -47,37 +39,28 @@ jobs:
4739
- name: Create artifacts directory
4840
run: mkdir -p ./artifacts
4941

50-
- name: Fetch cached x86_64-linux binary
51-
uses: actions/cache/restore@v4
42+
- name: Fetch x86_64-linux binary artifact
43+
uses: actions/download-artifact@v4
5244
with:
53-
path: nix-installer
54-
key: release-x86_64-linux-artifacts-${{ github.sha }}
55-
- name: Move artifact to artifacts directory
56-
run: mv ./nix-installer ./artifacts/nix-installer-x86_64-linux
57-
58-
- name: Fetch cached aarch64-linux binary
59-
uses: actions/cache/restore@v4
45+
name: nix-installer-x86_64-linux
46+
- name: Fetch aarch64-linux binary artifact
47+
uses: actions/download-artifact@v4
6048
with:
61-
path: nix-installer
62-
key: release-aarch64-linux-artifacts-${{ github.sha }}
63-
- name: Move artifact to artifacts directory
64-
run: mv ./nix-installer ./artifacts/nix-installer-aarch64-linux
65-
66-
- name: Fetch cached x86_64-darwin binary
67-
uses: actions/cache/restore@v4
49+
name: nix-installer-aarch64-linux
50+
- name: Fetch x86_64-darwin binary artifact
51+
uses: actions/download-artifact@v4
6852
with:
69-
path: nix-installer
70-
key: release-x86_64-darwin-artifacts-${{ github.sha }}
71-
- name: Move artifact to artifacts directory
72-
run: mv ./nix-installer ./artifacts/nix-installer-x86_64-darwin
73-
74-
- name: Fetch cached aarch64-darwin binary
75-
uses: actions/cache/restore@v4
53+
name: nix-installer-x86_64-darwin
54+
- name: Fetch aarch64-darwin binary artifact
55+
uses: actions/download-artifact@v4
7656
with:
77-
path: nix-installer
78-
key: release-aarch64-darwin-artifacts-${{ github.sha }}
79-
- name: Move artifact to artifacts directory
80-
run: mv ./nix-installer ./artifacts/nix-installer-aarch64-darwin
57+
name: nix-installer-aarch64-darwin
58+
- name: Move binaries into upload staging dir
59+
run: |
60+
mv nix-installer-x86_64-linux artifacts/
61+
mv nix-installer-aarch64-linux artifacts/
62+
mv nix-installer-x86_64-darwin artifacts/
63+
mv nix-installer-aarch64-darwin artifacts/
8164
8265
- name: Configure AWS Credentials
8366
uses: aws-actions/configure-aws-credentials@v2

0 commit comments

Comments
 (0)