Skip to content

Commit f055ac1

Browse files
committed
ci: update CI to use ubuntu-latest image
1 parent aa3dbd9 commit f055ac1

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ on:
4949
jobs:
5050
# Run 'dist plan' (or host) to determine what tasks we need to do
5151
plan:
52-
runs-on: "ubuntu-20.04"
52+
runs-on: "ubuntu-latest"
5353
outputs:
5454
val: ${{ steps.plan.outputs.manifest }}
5555
tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -174,7 +174,7 @@ jobs:
174174
needs:
175175
- plan
176176
- build-local-artifacts
177-
runs-on: "ubuntu-20.04"
177+
runs-on: "ubuntu-latest"
178178
env:
179179
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
180180
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -234,7 +234,7 @@ jobs:
234234
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-man.result == 'skipped' || needs.custom-build-man.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
235235
env:
236236
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
237-
runs-on: "ubuntu-20.04"
237+
runs-on: "ubuntu-latest"
238238
outputs:
239239
val: ${{ steps.host.outputs.manifest }}
240240
steps:
@@ -294,7 +294,7 @@ jobs:
294294
needs:
295295
- plan
296296
- host
297-
runs-on: "ubuntu-20.04"
297+
runs-on: "ubuntu-latest"
298298
env:
299299
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
300300
PLAN: ${{ needs.plan.outputs.val }}
@@ -344,7 +344,7 @@ jobs:
344344
# still allowing individual publish jobs to skip themselves (for prereleases).
345345
# "host" however must run to completion, no skipping allowed!
346346
if: ${{ always() && needs.host.result == 'success' && (needs.publish-homebrew-formula.result == 'skipped' || needs.publish-homebrew-formula.result == 'success') }}
347-
runs-on: "ubuntu-20.04"
347+
runs-on: "ubuntu-latest"
348348
env:
349349
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
350350
steps:

dist-workspace.toml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,21 @@ tap = "elkowar/homebrew-tap"
1616
publish-jobs = ["homebrew"]
1717
formula = "yolk"
1818
targets = [
19-
# "aarch64-apple-darwin",
20-
"x86_64-apple-darwin",
21-
"x86_64-unknown-linux-gnu",
22-
"x86_64-pc-windows-msvc",
23-
"x86_64-unknown-linux-musl",
19+
# "aarch64-apple-darwin",
20+
"x86_64-apple-darwin",
21+
"x86_64-unknown-linux-gnu",
22+
"x86_64-pc-windows-msvc",
23+
"x86_64-unknown-linux-musl",
2424
]
2525
install-path = "CARGO_HOME"
2626
install-updater = false
2727

2828
# include = ["yolk.man"]
29+
30+
31+
[dist.github-custom-runners]
32+
# Use an `ubuntu-latest` runner for all "global" steps of the release process,
33+
# rather than cargo-dist's default of using the oldest possible Linux runner.
34+
# This includes `plan`, `build-global-artifacts`, `host`, and `announce`, none
35+
# of which actually rely on the specific Linux version.
36+
global = "ubuntu-latest"

0 commit comments

Comments
 (0)