Skip to content

Commit 7ac3f38

Browse files
committed
0.2.8
1 parent 1ca6113 commit 7ac3f38

File tree

3 files changed

+292
-313
lines changed

3 files changed

+292
-313
lines changed

.github/workflows/release.yml

+38-31
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,28 @@ jobs:
6161
with:
6262
submodules: recursive
6363
- 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"
6565
- name: Install cargo-dist
6666
# we specify bash to get pipefail; it guards against the `curl` command
6767
# failing. otherwise `sh` won't catch that `curl` returned non-0
6868
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"
7070
# sure would be cool if github gave us proper conditionals...
7171
# so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
7272
# functionality based on whether this is a pull_request, and whether it's from a fork.
7373
# (PRs run on the *source* but secrets are usually on the *target* -- that's *good*
7474
# but also really annoying to build CI around when it needs secrets to work right.)
7575
- id: plan
7676
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
7878
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"
8181
- name: "Upload dist-manifest.json"
82-
uses: actions/upload-artifact@v3
82+
uses: actions/upload-artifact@v4
8383
with:
84-
name: artifacts
85-
path: dist-manifest.json
84+
name: artifacts-plan-dist-manifest
85+
path: plan-dist-manifest.json
8686

8787
# Build and packages all the platform-specific things
8888
build-local-artifacts:
@@ -113,16 +113,17 @@ jobs:
113113
with:
114114
submodules: recursive
115115
- 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"
117117
- uses: swatinem/rust-cache@v2
118118
- name: Install cargo-dist
119119
run: ${{ matrix.install_dist }}
120120
# Get the dist-manifest
121121
- name: Fetch local artifacts
122-
uses: actions/download-artifact@v3
122+
uses: actions/download-artifact@v4
123123
with:
124-
name: artifacts
124+
pattern: artifacts-*
125125
path: target/distrib/
126+
merge-multiple: true
126127
- name: Install dependencies
127128
run: |
128129
${{ matrix.packages_install }}
@@ -145,9 +146,9 @@ jobs:
145146
146147
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
147148
- name: "Upload artifacts"
148-
uses: actions/upload-artifact@v3
149+
uses: actions/upload-artifact@v4
149150
with:
150-
name: artifacts
151+
name: artifacts-build-local-${{ join(matrix.targets, '_') }}
151152
path: |
152153
${{ steps.cargo-dist.outputs.paths }}
153154
${{ env.BUILD_MANIFEST_NAME }}
@@ -166,15 +167,17 @@ jobs:
166167
with:
167168
submodules: recursive
168169
- 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"
170171
- 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"
172174
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
173175
- name: Fetch local artifacts
174-
uses: actions/download-artifact@v3
176+
uses: actions/download-artifact@v4
175177
with:
176-
name: artifacts
178+
pattern: artifacts-*
177179
path: target/distrib/
180+
merge-multiple: true
178181
- id: cargo-dist
179182
shell: bash
180183
run: |
@@ -188,9 +191,9 @@ jobs:
188191
189192
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
190193
- name: "Upload artifacts"
191-
uses: actions/upload-artifact@v3
194+
uses: actions/upload-artifact@v4
192195
with:
193-
name: artifacts
196+
name: artifacts-build-global
194197
path: |
195198
${{ steps.cargo-dist.outputs.paths }}
196199
${{ env.BUILD_MANIFEST_NAME }}
@@ -222,15 +225,16 @@ jobs:
222225
with:
223226
submodules: recursive
224227
- 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"
226229
- 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"
228231
# Fetch artifacts from scratch-storage
229232
- name: Fetch artifacts
230-
uses: actions/download-artifact@v3
233+
uses: actions/download-artifact@v4
231234
with:
232-
name: artifacts
235+
pattern: artifacts-*
233236
path: target/distrib/
237+
merge-multiple: true
234238
# Upload files to Axo Releases and create the Releases
235239
# This is a harmless no-op for Github Releases, hosting for that happens in "announce"
236240
- id: host
@@ -241,9 +245,10 @@ jobs:
241245
cat dist-manifest.json
242246
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
243247
- name: "Upload dist-manifest.json"
244-
uses: actions/upload-artifact@v3
248+
uses: actions/upload-artifact@v4
245249
with:
246-
name: artifacts
250+
# Overwrite the previous copy
251+
name: artifacts-dist-manifest
247252
path: dist-manifest.json
248253

249254
# Create an Announcement for all the Axo Releases, updating the "latest" release
@@ -265,22 +270,24 @@ jobs:
265270
with:
266271
submodules: recursive
267272
- 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"
269274
- 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"
271276
- name: Fetch Axo Artifacts
272-
uses: actions/download-artifact@v3
277+
uses: actions/download-artifact@v4
273278
with:
274-
name: artifacts
279+
pattern: artifacts-*
275280
path: target/distrib/
281+
merge-multiple: true
276282
- name: Announce Axo Releases
277283
run: |
278284
cargo dist host --steps=announce ${{ needs.plan.outputs.tag-flag }}
279285
- name: "Download Github Artifacts"
280-
uses: actions/download-artifact@v3
286+
uses: actions/download-artifact@v4
281287
with:
282-
name: artifacts
288+
pattern: artifacts-*
283289
path: artifacts
290+
merge-multiple: true
284291
- name: Cleanup
285292
run: |
286293
# Remove the granular manifests

0 commit comments

Comments
 (0)