From 319e1de58118bca78e195f1c84febb64aadd6a36 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 7 May 2025 09:32:08 +0200 Subject: [PATCH] ci: use ubuntu-latest instead of ubuntu-20.04 which is no longer available on Github --- .github/workflows/release.yml | 8 ++++---- dist-workspace.toml | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dc9d1e79..3ae24e03 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ on: jobs: # Run 'dist plan' (or host) to determine what tasks we need to do plan: - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-latest" outputs: val: ${{ steps.plan.outputs.manifest }} tag: ${{ !github.event.pull_request && github.ref_name || '' }} @@ -168,7 +168,7 @@ jobs: needs: - plan - build-local-artifacts - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-latest" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json @@ -218,7 +218,7 @@ jobs: 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') }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-latest" outputs: val: ${{ steps.host.outputs.manifest }} steps: @@ -282,7 +282,7 @@ jobs: # still allowing individual publish jobs to skip themselves (for prereleases). # "host" however must run to completion, no skipping allowed! if: ${{ always() && needs.host.result == 'success' }} - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-latest" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: diff --git a/dist-workspace.toml b/dist-workspace.toml index 03a34b41..9ae104b2 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -17,3 +17,8 @@ pr-run-mode = "plan" install-path = "CARGO_HOME" # Whether to install an updater program install-updater = false +# Ignore out-of-date contents +allow-dirty = ["ci"] + +[dist.github-custom-runners] +x86_64-unknown-linux-gnu = "ubuntu-latest"