Skip to content

Commit d1f7891

Browse files
committed
Switch back to official cargo-dist
It's happy to see that cargo-dist become maintained again. BTW, try to add loongarch64 build back to see if zigbuild works now.
1 parent 24af9ec commit d1f7891

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 4 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
@@ -58,12 +58,13 @@ jobs:
5858
steps:
5959
- 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/kxxt/cargo-dist/releases/download/v1.0.0-rc.1+kxxt.17/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
6869
uses: actions/upload-artifact@v4
6970
with:
@@ -117,6 +118,7 @@ jobs:
117118
git config --global core.longpaths true
118119
- 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 }}
@@ -196,6 +198,7 @@ jobs:
196198
steps:
197199
- uses: actions/checkout@v4
198200
with:
201+
persist-credentials: false
199202
submodules: recursive
200203
- name: Install cached dist
201204
uses: actions/download-artifact@v4
@@ -235,8 +238,8 @@ jobs:
235238
- plan
236239
- build-local-artifacts
237240
- build-global-artifacts
238-
# Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
239-
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') }}
241+
# Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
242+
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') }}
240243
env:
241244
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
242245
runs-on: "ubuntu-22.04"
@@ -245,6 +248,7 @@ jobs:
245248
steps:
246249
- uses: actions/checkout@v4
247250
with:
251+
persist-credentials: false
248252
submodules: recursive
249253
- name: Install cached dist
250254
uses: actions/download-artifact@v4
@@ -309,4 +313,5 @@ jobs:
309313
steps:
310314
- uses: actions/checkout@v4
311315
with:
316+
persist-credentials: false
312317
submodules: recursive

dist-workspace.toml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,14 @@ github-build-setup = "../build-setup.yml"
77
# Which actions to run on pull requests
88
pr-run-mode = "upload"
99
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
10-
cargo-dist-version = "1.0.0-rc.1+kxxt.17"
10+
cargo-dist-version = "0.30.2"
1111
# CI backends to support
1212
ci = "github"
1313
# The installers to generate for each app
1414
installers = ["shell", "powershell"]
1515
# Target platforms to build apps for (Rust target-triple syntax)
16-
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "powerpc64le-unknown-linux-gnu", "powerpc64le-unknown-linux-musl", "riscv64gc-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
16+
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "loongarch64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "powerpc64le-unknown-linux-musl", "riscv64gc-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
1717
# Path that installers should place binaries in
1818
install-path = "CARGO_HOME"
1919
# Whether to install an updater program
2020
install-updater = false
21-
22-
[dist.github-custom-runners.loongarch64-unknown-linux-gnu]
23-
container = { image = "ghcr.io/kxxt/loongarch64-linux-gnu-runner:latest", host = "x86_64-unknown-linux-gnu" }
24-
25-
[dist.github-custom-runners]
26-
riscv64gc-unknown-linux-gnu = "ubuntu-22.04"

0 commit comments

Comments
 (0)