Skip to content

Commit 532a87a

Browse files
committed
feat: use fork of cargo dist with windows support
1 parent 3c7eaef commit 532a87a

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist
1+
# This file was autogenerated by dist: https://opensource.axo.dev/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-22.04"
50+
runs-on: "ubuntu-20.04"
5151
outputs:
5252
val: ${{ steps.plan.outputs.manifest }}
5353
tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -58,13 +58,12 @@ jobs:
5858
steps:
5959
- uses: actions/checkout@v4
6060
with:
61-
persist-credentials: false
6261
submodules: recursive
6362
- name: Install dist
6463
# we specify bash to get pipefail; it guards against the `curl` command
6564
# failing. otherwise `sh` won't catch that `curl` returned non-0
6665
shell: bash
67-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.29.0/cargo-dist-installer.sh | sh"
66+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/jacobtread/cargo-dist/releases/download/cargo-dist-installer.sh | sh"
6867
- name: Cache dist
6968
uses: actions/upload-artifact@v4
7069
with:
@@ -118,7 +117,6 @@ jobs:
118117
git config --global core.longpaths true
119118
- uses: actions/checkout@v4
120119
with:
121-
persist-credentials: false
122120
submodules: recursive
123121
- name: Install Rust non-interactively if not already installed
124122
if: ${{ matrix.container }}
@@ -170,14 +168,13 @@ jobs:
170168
needs:
171169
- plan
172170
- build-local-artifacts
173-
runs-on: "ubuntu-22.04"
171+
runs-on: "ubuntu-20.04"
174172
env:
175173
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
176174
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
177175
steps:
178176
- uses: actions/checkout@v4
179177
with:
180-
persist-credentials: false
181178
submodules: recursive
182179
- name: Install cached dist
183180
uses: actions/download-artifact@v4
@@ -221,13 +218,12 @@ jobs:
221218
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') }}
222219
env:
223220
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
224-
runs-on: "ubuntu-22.04"
221+
runs-on: "ubuntu-20.04"
225222
outputs:
226223
val: ${{ steps.host.outputs.manifest }}
227224
steps:
228225
- uses: actions/checkout@v4
229226
with:
230-
persist-credentials: false
231227
submodules: recursive
232228
- name: Install cached dist
233229
uses: actions/download-artifact@v4
@@ -282,7 +278,7 @@ jobs:
282278
needs:
283279
- plan
284280
- host
285-
runs-on: "ubuntu-22.04"
281+
runs-on: "ubuntu-20.04"
286282
env:
287283
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
288284
PLAN: ${{ needs.plan.outputs.val }}
@@ -315,11 +311,10 @@ jobs:
315311
# still allowing individual publish jobs to skip themselves (for prereleases).
316312
# "host" however must run to completion, no skipping allowed!
317313
if: ${{ always() && needs.host.result == 'success' && (needs.publish-npm.result == 'skipped' || needs.publish-npm.result == 'success') }}
318-
runs-on: "ubuntu-22.04"
314+
runs-on: "ubuntu-20.04"
319315
env:
320316
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
321317
steps:
322318
- uses: actions/checkout@v4
323319
with:
324-
persist-credentials: false
325320
submodules: recursive

dist-workspace.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ 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.29.0"
7+
cargo-dist-version = "1.0.0-rc.1"
8+
# A URL to use to install `cargo-dist` (with the installer script)
9+
cargo-dist-url-override = "https://github.com/jacobtread/cargo-dist/releases/download"
810
# CI backends to support
911
ci = "github"
1012
# The installers to generate for each app

0 commit comments

Comments
 (0)