Skip to content

Commit c0839ef

Browse files
authored
Update dist configuration (#1013)
* Update dist configuration * Also bump Arm64 release to ubuntu-latest
1 parent 7e04461 commit c0839ef

File tree

1 file changed

+30
-1
lines changed

1 file changed

+30
-1
lines changed

dist-workspace.toml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,47 @@ members = ["cargo:."]
33

44
# Config for 'dist'
55
[dist]
6+
67
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
78
cargo-dist-version = "0.28.0"
9+
810
# CI backends to support
911
ci = "github"
12+
1013
# The installers to generate for each app
1114
installers = ["shell"]
15+
1216
# Target platforms to build apps for (Rust target-triple syntax)
13-
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
17+
targets = [
18+
"aarch64-apple-darwin",
19+
"aarch64-unknown-linux-gnu",
20+
"x86_64-apple-darwin",
21+
"x86_64-unknown-linux-gnu",
22+
"x86_64-pc-windows-msvc"
23+
]
24+
1425
# Path that installers should place binaries in
1526
install-path = "CARGO_HOME"
27+
1628
# Whether to install an updater program
1729
install-updater = false
1830

31+
########################################################################
32+
33+
# Custom runner set-up to workaround ubuntu-20.04 deprecation
34+
# See https://github.com/axodotdev/cargo-dist/issues/1760#issuecomment-2769218034
35+
1936
[dist.github-custom-runners]
2037
global = "ubuntu-latest"
38+
39+
[dist.github-custom-runners.x86_64-unknown-linux-gnu]
40+
runner = "ubuntu-latest"
41+
42+
[dist.github-custom-runners.aarch64-unknown-linux-gnu]
43+
runner = "ubuntu-latest"
44+
45+
[dist.github-custom-runners.aarch64-pc-windows-msvc]
46+
# https://github.com/axodotdev/cargo-dist/blob/c8ba950c63f9c38c77782912ec6cdb6807bd0fbd/cargo-dist/src/backend/ci/github.rs#L678-L688
47+
runner = "ubuntu-latest"
48+
host = "x86_64-unknown-linux-gnu"
49+
container = { image = "messense/cargo-xwin", host = "x86_64-unknown-linux-musl", package_manager = "apt" }

0 commit comments

Comments
 (0)