Skip to content

Commit ece7744

Browse files
fix: dist global host fixup
Signed-off-by: Andrew Lilley Brinker <alilleybrinker@gmail.com>
1 parent 2de861a commit ece7744

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 4 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-22.04"
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-22.04"
178178
env:
179179
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
180180
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -224,7 +224,7 @@ jobs:
224224
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') }}
225225
env:
226226
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
227-
runs-on: "ubuntu-20.04"
227+
runs-on: "ubuntu-22.04"
228228
outputs:
229229
val: ${{ steps.host.outputs.manifest }}
230230
steps:
@@ -288,7 +288,7 @@ jobs:
288288
# still allowing individual publish jobs to skip themselves (for prereleases).
289289
# "host" however must run to completion, no skipping allowed!
290290
if: ${{ always() && needs.host.result == 'success' }}
291-
runs-on: "ubuntu-20.04"
291+
runs-on: "ubuntu-22.04"
292292
env:
293293
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
294294
steps:

dist-workspace.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ install-path = ["~/.local/bin", "~/.omnibor/bin"]
2929

3030
# NOTE: MUST be synced manually with runners in `.github/workflows/test.yml`
3131
[dist.github-custom-runners]
32+
# Needed to run, generally, given the Ubuntu 20.04 retirement.
33+
global = "ubuntu-22.04"
3234
# Ensure Apple Silicon macOS builds run natively rather than cross-compiling
3335
# from x86. Also makes sure our Apple Silicon macOS release builds match the
3436
# runner used for regular CI testing.

0 commit comments

Comments
 (0)