Skip to content

Commit f24239d

Browse files
committed
Fix linux-musl target
1 parent 6136367 commit f24239d

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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-latest"
50+
runs-on: "ubuntu-22.04"
5151
outputs:
5252
val: ${{ steps.plan.outputs.manifest }}
5353
tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -170,7 +170,7 @@ jobs:
170170
needs:
171171
- plan
172172
- build-local-artifacts
173-
runs-on: "ubuntu-latest"
173+
runs-on: "ubuntu-22.04"
174174
env:
175175
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
176176
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -220,7 +220,7 @@ jobs:
220220
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') }}
221221
env:
222222
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
223-
runs-on: "ubuntu-latest"
223+
runs-on: "ubuntu-22.04"
224224
outputs:
225225
val: ${{ steps.host.outputs.manifest }}
226226
steps:
@@ -280,7 +280,7 @@ jobs:
280280
needs:
281281
- plan
282282
- host
283-
runs-on: "ubuntu-latest"
283+
runs-on: "ubuntu-22.04"
284284
env:
285285
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
286286
PLAN: ${{ needs.plan.outputs.val }}
@@ -330,7 +330,7 @@ jobs:
330330
# still allowing individual publish jobs to skip themselves (for prereleases).
331331
# "host" however must run to completion, no skipping allowed!
332332
if: ${{ always() && needs.host.result == 'success' && (needs.publish-homebrew-formula.result == 'skipped' || needs.publish-homebrew-formula.result == 'success') }}
333-
runs-on: "ubuntu-latest"
333+
runs-on: "ubuntu-22.04"
334334
env:
335335
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
336336
steps:

dist-workspace.toml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,7 @@ installers = ["shell", "powershell", "homebrew"]
1515
# A GitHub repo to push Homebrew formulas to
1616
tap = "kobaltcore/homebrew-renkit"
1717
# Target platforms to build apps for (Rust target-triple syntax)
18-
targets = [
19-
"aarch64-apple-darwin",
20-
"aarch64-unknown-linux-gnu",
21-
# "aarch64-pc-windows-msvc",
22-
"x86_64-apple-darwin",
23-
"x86_64-unknown-linux-gnu",
24-
"x86_64-unknown-linux-musl",
25-
"x86_64-pc-windows-msvc",
26-
]
18+
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
2719
# Publish jobs to run in CI
2820
publish-jobs = ["homebrew"]
2921
# Which actions to run on pull requests
@@ -36,6 +28,7 @@ install-path = "CARGO_HOME"
3628
github-build-setup = "../templates/build_setup.yml"
3729

3830
[dist.github-custom-runners]
39-
global = "ubuntu-latest"
31+
global = "ubuntu-22.04"
4032
aarch64-unknown-linux-gnu = "ubuntu-22.04-arm"
4133
x86_64-unknown-linux-gnu = "ubuntu-22.04"
34+
x86_64-unknown-linux-musl = "ubuntu-22.04"

0 commit comments

Comments
 (0)