Skip to content

Commit 6f24761

Browse files
committed
Update dist
1 parent ea0bf8c commit 6f24761

2 files changed

Lines changed: 31 additions & 27 deletions

File tree

.github/workflows/release.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ jobs:
5555
env:
5656
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5757
steps:
58-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v6
5959
with:
6060
persist-credentials: false
6161
submodules: recursive
6262
- name: Install dist
6363
# we specify bash to get pipefail; it guards against the `curl` command
6464
# failing. otherwise `sh` won't catch that `curl` returned non-0
6565
shell: bash
66-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.3/cargo-dist-installer.sh | sh"
66+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.31.0/cargo-dist-installer.sh | sh"
6767
- name: Cache dist
68-
uses: actions/upload-artifact@v4
68+
uses: actions/upload-artifact@v6
6969
with:
7070
name: cargo-dist-cache
7171
path: ~/.cargo/bin/dist
@@ -81,7 +81,7 @@ jobs:
8181
cat plan-dist-manifest.json
8282
echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
8383
- name: "Upload dist-manifest.json"
84-
uses: actions/upload-artifact@v4
84+
uses: actions/upload-artifact@v6
8585
with:
8686
name: artifacts-plan-dist-manifest
8787
path: plan-dist-manifest.json
@@ -115,7 +115,7 @@ jobs:
115115
- name: enable windows longpaths
116116
run: |
117117
git config --global core.longpaths true
118-
- uses: actions/checkout@v4
118+
- uses: actions/checkout@v6
119119
with:
120120
persist-credentials: false
121121
submodules: recursive
@@ -130,7 +130,7 @@ jobs:
130130
run: ${{ matrix.install_dist.run }}
131131
# Get the dist-manifest
132132
- name: Fetch local artifacts
133-
uses: actions/download-artifact@v4
133+
uses: actions/download-artifact@v7
134134
with:
135135
pattern: artifacts-*
136136
path: target/distrib/
@@ -157,7 +157,7 @@ jobs:
157157
158158
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
159159
- name: "Upload artifacts"
160-
uses: actions/upload-artifact@v4
160+
uses: actions/upload-artifact@v6
161161
with:
162162
name: artifacts-build-local-${{ join(matrix.targets, '_') }}
163163
path: |
@@ -174,19 +174,19 @@ jobs:
174174
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
175175
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
176176
steps:
177-
- uses: actions/checkout@v4
177+
- uses: actions/checkout@v6
178178
with:
179179
persist-credentials: false
180180
submodules: recursive
181181
- name: Install cached dist
182-
uses: actions/download-artifact@v4
182+
uses: actions/download-artifact@v7
183183
with:
184184
name: cargo-dist-cache
185185
path: ~/.cargo/bin/
186186
- run: chmod +x ~/.cargo/bin/dist
187187
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
188188
- name: Fetch local artifacts
189-
uses: actions/download-artifact@v4
189+
uses: actions/download-artifact@v7
190190
with:
191191
pattern: artifacts-*
192192
path: target/distrib/
@@ -204,7 +204,7 @@ jobs:
204204
205205
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
206206
- name: "Upload artifacts"
207-
uses: actions/upload-artifact@v4
207+
uses: actions/upload-artifact@v6
208208
with:
209209
name: artifacts-build-global
210210
path: |
@@ -224,19 +224,19 @@ jobs:
224224
outputs:
225225
val: ${{ steps.host.outputs.manifest }}
226226
steps:
227-
- uses: actions/checkout@v4
227+
- uses: actions/checkout@v6
228228
with:
229229
persist-credentials: false
230230
submodules: recursive
231231
- name: Install cached dist
232-
uses: actions/download-artifact@v4
232+
uses: actions/download-artifact@v7
233233
with:
234234
name: cargo-dist-cache
235235
path: ~/.cargo/bin/
236236
- run: chmod +x ~/.cargo/bin/dist
237237
# Fetch artifacts from scratch-storage
238238
- name: Fetch artifacts
239-
uses: actions/download-artifact@v4
239+
uses: actions/download-artifact@v7
240240
with:
241241
pattern: artifacts-*
242242
path: target/distrib/
@@ -249,14 +249,14 @@ jobs:
249249
cat dist-manifest.json
250250
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
251251
- name: "Upload dist-manifest.json"
252-
uses: actions/upload-artifact@v4
252+
uses: actions/upload-artifact@v6
253253
with:
254254
# Overwrite the previous copy
255255
name: artifacts-dist-manifest
256256
path: dist-manifest.json
257257
# Create a GitHub Release while uploading all files to it
258258
- name: "Download GitHub Artifacts"
259-
uses: actions/download-artifact@v4
259+
uses: actions/download-artifact@v7
260260
with:
261261
pattern: artifacts-*
262262
path: artifacts
@@ -289,14 +289,14 @@ jobs:
289289
GITHUB_EMAIL: "admin+bot@axo.dev"
290290
if: ${{ !fromJson(needs.plan.outputs.val).announcement_is_prerelease || fromJson(needs.plan.outputs.val).publish_prereleases }}
291291
steps:
292-
- uses: actions/checkout@v4
292+
- uses: actions/checkout@v6
293293
with:
294294
persist-credentials: true
295295
repository: "jacktabscode/homebrew-tap"
296296
token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
297297
# So we have access to the formula
298298
- name: Fetch homebrew formulae
299-
uses: actions/download-artifact@v4
299+
uses: actions/download-artifact@v7
300300
with:
301301
pattern: artifacts-*
302302
path: Formula/
@@ -336,7 +336,7 @@ jobs:
336336
env:
337337
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
338338
steps:
339-
- uses: actions/checkout@v4
339+
- uses: actions/checkout@v6
340340
with:
341341
persist-credentials: false
342342
submodules: recursive

dist-workspace.toml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
[workspace]
22
members = ["cargo:."]
33

4+
# Config for 'dist'
45
[dist]
5-
cargo-dist-version = "0.30.3"
6+
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
7+
cargo-dist-version = "0.31.0"
8+
# CI backends to support
69
ci = "github"
10+
# The installers to generate for each app
711
installers = ["homebrew"]
12+
# A GitHub repo to push Homebrew formulas to
813
tap = "jacktabscode/homebrew-tap"
14+
# Publish jobs to run in CI
915
publish-jobs = ["homebrew"]
10-
targets = [
11-
"aarch64-apple-darwin",
12-
"aarch64-unknown-linux-gnu",
13-
"x86_64-apple-darwin",
14-
"x86_64-unknown-linux-gnu",
15-
"x86_64-pc-windows-msvc"
16-
]
16+
# Target platforms to build apps for (Rust target-triple syntax)
17+
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
18+
# Which actions to run on pull requests
1719
pr-run-mode = "skip"
20+
# Checksums to generate for each App
1821
checksum = "false"
22+
# Generate and dist a source tarball
1923
source-tarball = false

0 commit comments

Comments
 (0)