@@ -61,28 +61,28 @@ jobs:
61
61
with :
62
62
submodules : recursive
63
63
- name : Install Rust
64
- run : rustup update "1.72.1 " --no-self-update && rustup default "1.72.1 "
64
+ run : rustup update "1.74.0 " --no-self-update && rustup default "1.74.0 "
65
65
- name : Install cargo-dist
66
66
# we specify bash to get pipefail; it guards against the `curl` command
67
67
# failing. otherwise `sh` won't catch that `curl` returned non-0
68
68
shell : bash
69
- run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.7.2 /cargo-dist-installer.sh | sh"
69
+ run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.11.1 /cargo-dist-installer.sh | sh"
70
70
# sure would be cool if github gave us proper conditionals...
71
71
# so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
72
72
# functionality based on whether this is a pull_request, and whether it's from a fork.
73
73
# (PRs run on the *source* but secrets are usually on the *target* -- that's *good*
74
74
# but also really annoying to build CI around when it needs secrets to work right.)
75
75
- id : plan
76
76
run : |
77
- cargo dist ${{ !github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name) || (github.event.pull_request.head.repo.fork && 'plan' || ' host --steps=check') }} --output-format=json > dist-manifest.json
77
+ cargo dist ${{ ( !github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || (env.AXO_RELEASES_TOKEN && 'host --steps=check') || 'plan' }} --output-format=json > plan- dist-manifest.json
78
78
echo "cargo dist ran successfully"
79
- cat dist-manifest.json
80
- echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
79
+ cat plan- dist-manifest.json
80
+ echo "manifest=$(jq -c "." plan- dist-manifest.json)" >> "$GITHUB_OUTPUT"
81
81
- name : " Upload dist-manifest.json"
82
- uses : actions/upload-artifact@v3
82
+ uses : actions/upload-artifact@v4
83
83
with :
84
- name : artifacts
85
- path : dist-manifest.json
84
+ name : artifacts-plan-dist-manifest
85
+ path : plan- dist-manifest.json
86
86
87
87
# Build and packages all the platform-specific things
88
88
build-local-artifacts :
@@ -113,16 +113,17 @@ jobs:
113
113
with :
114
114
submodules : recursive
115
115
- name : Install Rust
116
- run : rustup update "1.72.1 " --no-self-update && rustup default "1.72.1 "
116
+ run : rustup update "1.74.0 " --no-self-update && rustup default "1.74.0 "
117
117
- uses : swatinem/rust-cache@v2
118
118
- name : Install cargo-dist
119
119
run : ${{ matrix.install_dist }}
120
120
# Get the dist-manifest
121
121
- name : Fetch local artifacts
122
- uses : actions/download-artifact@v3
122
+ uses : actions/download-artifact@v4
123
123
with :
124
- name : artifacts
124
+ pattern : artifacts-*
125
125
path : target/distrib/
126
+ merge-multiple : true
126
127
- name : Install dependencies
127
128
run : |
128
129
${{ matrix.packages_install }}
@@ -145,9 +146,9 @@ jobs:
145
146
146
147
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
147
148
- name : " Upload artifacts"
148
- uses : actions/upload-artifact@v3
149
+ uses : actions/upload-artifact@v4
149
150
with :
150
- name : artifacts
151
+ name : artifacts-build-local-${{ join(matrix.targets, '_') }}
151
152
path : |
152
153
${{ steps.cargo-dist.outputs.paths }}
153
154
${{ env.BUILD_MANIFEST_NAME }}
@@ -166,15 +167,17 @@ jobs:
166
167
with :
167
168
submodules : recursive
168
169
- name : Install Rust
169
- run : rustup update "1.72.1 " --no-self-update && rustup default "1.72.1 "
170
+ run : rustup update "1.74.0 " --no-self-update && rustup default "1.74.0 "
170
171
- name : Install cargo-dist
171
- run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.7.2/cargo-dist-installer.sh | sh"
172
+ shell : bash
173
+ run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.11.1/cargo-dist-installer.sh | sh"
172
174
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
173
175
- name : Fetch local artifacts
174
- uses : actions/download-artifact@v3
176
+ uses : actions/download-artifact@v4
175
177
with :
176
- name : artifacts
178
+ pattern : artifacts-*
177
179
path : target/distrib/
180
+ merge-multiple : true
178
181
- id : cargo-dist
179
182
shell : bash
180
183
run : |
@@ -188,9 +191,9 @@ jobs:
188
191
189
192
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
190
193
- name : " Upload artifacts"
191
- uses : actions/upload-artifact@v3
194
+ uses : actions/upload-artifact@v4
192
195
with :
193
- name : artifacts
196
+ name : artifacts-build-global
194
197
path : |
195
198
${{ steps.cargo-dist.outputs.paths }}
196
199
${{ env.BUILD_MANIFEST_NAME }}
@@ -222,15 +225,16 @@ jobs:
222
225
with :
223
226
submodules : recursive
224
227
- name : Install Rust
225
- run : rustup update "1.72.1 " --no-self-update && rustup default "1.72.1 "
228
+ run : rustup update "1.74.0 " --no-self-update && rustup default "1.74.0 "
226
229
- name : Install cargo-dist
227
- run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.7.2 /cargo-dist-installer.sh | sh"
230
+ run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.11.1 /cargo-dist-installer.sh | sh"
228
231
# Fetch artifacts from scratch-storage
229
232
- name : Fetch artifacts
230
- uses : actions/download-artifact@v3
233
+ uses : actions/download-artifact@v4
231
234
with :
232
- name : artifacts
235
+ pattern : artifacts-*
233
236
path : target/distrib/
237
+ merge-multiple : true
234
238
# Upload files to Axo Releases and create the Releases
235
239
# This is a harmless no-op for Github Releases, hosting for that happens in "announce"
236
240
- id : host
@@ -241,9 +245,10 @@ jobs:
241
245
cat dist-manifest.json
242
246
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
243
247
- name : " Upload dist-manifest.json"
244
- uses : actions/upload-artifact@v3
248
+ uses : actions/upload-artifact@v4
245
249
with :
246
- name : artifacts
250
+ # Overwrite the previous copy
251
+ name : artifacts-dist-manifest
247
252
path : dist-manifest.json
248
253
249
254
# Create an Announcement for all the Axo Releases, updating the "latest" release
@@ -265,22 +270,24 @@ jobs:
265
270
with :
266
271
submodules : recursive
267
272
- name : Install Rust
268
- run : rustup update "1.72.1 " --no-self-update && rustup default "1.72.1 "
273
+ run : rustup update "1.74.0 " --no-self-update && rustup default "1.74.0 "
269
274
- name : Install cargo-dist
270
- run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.7.2 /cargo-dist-installer.sh | sh"
275
+ run : " curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.11.1 /cargo-dist-installer.sh | sh"
271
276
- name : Fetch Axo Artifacts
272
- uses : actions/download-artifact@v3
277
+ uses : actions/download-artifact@v4
273
278
with :
274
- name : artifacts
279
+ pattern : artifacts-*
275
280
path : target/distrib/
281
+ merge-multiple : true
276
282
- name : Announce Axo Releases
277
283
run : |
278
284
cargo dist host --steps=announce ${{ needs.plan.outputs.tag-flag }}
279
285
- name : " Download Github Artifacts"
280
- uses : actions/download-artifact@v3
286
+ uses : actions/download-artifact@v4
281
287
with :
282
- name : artifacts
288
+ pattern : artifacts-*
283
289
path : artifacts
290
+ merge-multiple : true
284
291
- name : Cleanup
285
292
run : |
286
293
# Remove the granular manifests
0 commit comments