Skip to content

Commit bf65538

Browse files
committed
Update cargo-dist to 0.30.2
1 parent be60452 commit bf65538

File tree

2 files changed

+30
-25
lines changed

2 files changed

+30
-25
lines changed

.github/workflows/release.yml

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was autogenerated by dist: https://opensource.axo.dev/cargo-dist/
1+
# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist
22
#
33
# Copyright 2022-2024, axodotdev
44
# SPDX-License-Identifier: MIT or Apache-2.0
@@ -47,7 +47,7 @@ on:
4747
jobs:
4848
# Run 'dist plan' (or host) to determine what tasks we need to do
4949
plan:
50-
runs-on: "ubuntu-20.04"
50+
runs-on: "ubuntu-22.04"
5151
outputs:
5252
val: ${{ steps.plan.outputs.manifest }}
5353
tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -56,16 +56,17 @@ jobs:
5656
env:
5757
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5858
steps:
59-
- uses: actions/checkout@v5
59+
- uses: actions/checkout@v4
6060
with:
61+
persist-credentials: false
6162
submodules: recursive
6263
- name: Install dist
6364
# we specify bash to get pipefail; it guards against the `curl` command
6465
# failing. otherwise `sh` won't catch that `curl` returned non-0
6566
shell: bash
66-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.28.0/cargo-dist-installer.sh | sh"
67+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.2/cargo-dist-installer.sh | sh"
6768
- name: Cache dist
68-
uses: actions/upload-artifact@v5
69+
uses: actions/upload-artifact@v4
6970
with:
7071
name: cargo-dist-cache
7172
path: ~/.cargo/bin/dist
@@ -81,7 +82,7 @@ jobs:
8182
cat plan-dist-manifest.json
8283
echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
8384
- name: "Upload dist-manifest.json"
84-
uses: actions/upload-artifact@v5
85+
uses: actions/upload-artifact@v4
8586
with:
8687
name: artifacts-plan-dist-manifest
8788
path: plan-dist-manifest.json
@@ -115,8 +116,9 @@ jobs:
115116
- name: enable windows longpaths
116117
run: |
117118
git config --global core.longpaths true
118-
- uses: actions/checkout@v5
119+
- uses: actions/checkout@v4
119120
with:
121+
persist-credentials: false
120122
submodules: recursive
121123
- name: Install Rust non-interactively if not already installed
122124
if: ${{ matrix.container }}
@@ -133,7 +135,7 @@ jobs:
133135
run: ${{ matrix.install_dist.run }}
134136
# Get the dist-manifest
135137
- name: Fetch local artifacts
136-
uses: actions/download-artifact@v6
138+
uses: actions/download-artifact@v4
137139
with:
138140
pattern: artifacts-*
139141
path: target/distrib/
@@ -160,7 +162,7 @@ jobs:
160162
161163
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
162164
- name: "Upload artifacts"
163-
uses: actions/upload-artifact@v5
165+
uses: actions/upload-artifact@v4
164166
with:
165167
name: artifacts-build-local-${{ join(matrix.targets, '_') }}
166168
path: |
@@ -172,23 +174,24 @@ jobs:
172174
needs:
173175
- plan
174176
- build-local-artifacts
175-
runs-on: "ubuntu-20.04"
177+
runs-on: "ubuntu-22.04"
176178
env:
177179
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
178180
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
179181
steps:
180-
- uses: actions/checkout@v5
182+
- uses: actions/checkout@v4
181183
with:
184+
persist-credentials: false
182185
submodules: recursive
183186
- name: Install cached dist
184-
uses: actions/download-artifact@v6
187+
uses: actions/download-artifact@v4
185188
with:
186189
name: cargo-dist-cache
187190
path: ~/.cargo/bin/
188191
- run: chmod +x ~/.cargo/bin/dist
189192
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
190193
- name: Fetch local artifacts
191-
uses: actions/download-artifact@v6
194+
uses: actions/download-artifact@v4
192195
with:
193196
pattern: artifacts-*
194197
path: target/distrib/
@@ -206,7 +209,7 @@ jobs:
206209
207210
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
208211
- name: "Upload artifacts"
209-
uses: actions/upload-artifact@v5
212+
uses: actions/upload-artifact@v4
210213
with:
211214
name: artifacts-build-global
212215
path: |
@@ -218,26 +221,27 @@ jobs:
218221
- plan
219222
- build-local-artifacts
220223
- build-global-artifacts
221-
# Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
222-
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
224+
# Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
225+
if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
223226
env:
224227
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
225-
runs-on: "ubuntu-20.04"
228+
runs-on: "ubuntu-22.04"
226229
outputs:
227230
val: ${{ steps.host.outputs.manifest }}
228231
steps:
229-
- uses: actions/checkout@v5
232+
- uses: actions/checkout@v4
230233
with:
234+
persist-credentials: false
231235
submodules: recursive
232236
- name: Install cached dist
233-
uses: actions/download-artifact@v6
237+
uses: actions/download-artifact@v4
234238
with:
235239
name: cargo-dist-cache
236240
path: ~/.cargo/bin/
237241
- run: chmod +x ~/.cargo/bin/dist
238242
# Fetch artifacts from scratch-storage
239243
- name: Fetch artifacts
240-
uses: actions/download-artifact@v6
244+
uses: actions/download-artifact@v4
241245
with:
242246
pattern: artifacts-*
243247
path: target/distrib/
@@ -250,14 +254,14 @@ jobs:
250254
cat dist-manifest.json
251255
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
252256
- name: "Upload dist-manifest.json"
253-
uses: actions/upload-artifact@v5
257+
uses: actions/upload-artifact@v4
254258
with:
255259
# Overwrite the previous copy
256260
name: artifacts-dist-manifest
257261
path: dist-manifest.json
258262
# Create a GitHub Release while uploading all files to it
259263
- name: "Download GitHub Artifacts"
260-
uses: actions/download-artifact@v6
264+
uses: actions/download-artifact@v4
261265
with:
262266
pattern: artifacts-*
263267
path: artifacts
@@ -286,10 +290,11 @@ jobs:
286290
# still allowing individual publish jobs to skip themselves (for prereleases).
287291
# "host" however must run to completion, no skipping allowed!
288292
if: ${{ always() && needs.host.result == 'success' }}
289-
runs-on: "ubuntu-20.04"
293+
runs-on: "ubuntu-22.04"
290294
env:
291295
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
292296
steps:
293-
- uses: actions/checkout@v5
297+
- uses: actions/checkout@v4
294298
with:
299+
persist-credentials: false
295300
submodules: recursive

dist-workspace.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ members = ["cargo:."]
44
# Config for 'dist'
55
[dist]
66
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
7-
cargo-dist-version = "0.28.0"
7+
cargo-dist-version = "0.30.2"
88
# CI backends to support
99
ci = "github"
1010
# The installers to generate for each app

0 commit comments

Comments
 (0)