Skip to content

Commit 6d8e58b

Browse files
chore: further dist fixups
Signed-off-by: Andrew Lilley Brinker <alilleybrinker@gmail.com>
1 parent 66dfcf9 commit 6d8e58b

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
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-22.04"
52+
runs-on: "ubuntu-20.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-22.04"
177+
runs-on: "ubuntu-20.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-22.04"
227+
runs-on: "ubuntu-20.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-22.04"
291+
runs-on: "ubuntu-20.04"
292292
env:
293293
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
294294
steps:

dist-workspace.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ targets = [
1616
"aarch64-unknown-linux-gnu",
1717
"x86_64-unknown-linux-gnu",
1818
"x86_64-unknown-linux-musl",
19-
"aarch64-pc-windows-msvc",
2019
"x86_64-pc-windows-msvc",
2120
]
2221
# Which actions to run on pull requests
@@ -46,5 +45,4 @@ x86_64-unknown-linux-gnu = "ubuntu-22.04"
4645
x86_64-unknown-linux-musl = "ubuntu-22.04"
4746
# GitHub has sunset older versions of windows, so this ensures we can actually
4847
# run in GitHub Actions.
49-
aarch64-pc-windows-msvc = "windows-2022"
5048
x86_64-pc-windows-msvc = "windows-2022"

0 commit comments

Comments
 (0)