Skip to content

Commit ee8c5e1

Browse files
committed
ci: update cargo-dist runners to ubuntu-22.04
1 parent 6516da5 commit ee8c5e1

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/release.yml

Lines changed: 6 additions & 6 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 || '' }}
@@ -147,7 +147,7 @@ jobs:
147147
dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
148148
echo "dist ran successfully"
149149
- name: Attest
150-
uses: actions/attest-build-provenance@v2
150+
uses: actions/attest-build-provenance@v1
151151
with:
152152
subject-path: "target/distrib/*${{ join(matrix.targets, ', ') }}*"
153153
- id: cargo-dist
@@ -176,7 +176,7 @@ jobs:
176176
needs:
177177
- plan
178178
- build-local-artifacts
179-
runs-on: "ubuntu-20.04"
179+
runs-on: "ubuntu-22.04"
180180
env:
181181
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
182182
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -245,7 +245,7 @@ jobs:
245245
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') }}
246246
env:
247247
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
248-
runs-on: "ubuntu-20.04"
248+
runs-on: "ubuntu-22.04"
249249
outputs:
250250
val: ${{ steps.host.outputs.manifest }}
251251
steps:
@@ -305,7 +305,7 @@ jobs:
305305
needs:
306306
- plan
307307
- host
308-
runs-on: "ubuntu-20.04"
308+
runs-on: "ubuntu-22.04"
309309
env:
310310
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
311311
PLAN: ${{ needs.plan.outputs.val }}
@@ -355,7 +355,7 @@ jobs:
355355
# still allowing individual publish jobs to skip themselves (for prereleases).
356356
# "host" however must run to completion, no skipping allowed!
357357
if: ${{ always() && needs.host.result == 'success' && (needs.publish-homebrew-formula.result == 'skipped' || needs.publish-homebrew-formula.result == 'success') }}
358-
runs-on: "ubuntu-20.04"
358+
runs-on: "ubuntu-22.04"
359359
env:
360360
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
361361
steps:

dist-workspace.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ github-attestations = true
2727
cargo-auditable = true
2828
# Whether to use cargo-cyclonedx to generate an SBOM
2929
cargo-cyclonedx = true
30+
31+
[dist.github-custom-runners]
32+
global = "ubuntu-22.04"

0 commit comments

Comments
 (0)