Skip to content

Commit

Permalink
Auto merge of #2890 - JohnTitor:gha-ubuntu-22.04, r=JohnTitor
Browse files Browse the repository at this point in the history
Upgrade Ubuntu image on GHA to 22.04

This updates Ubuntu image on GHA to 22.04.
Note that this doesn't update images on Docker so I expect the effect is relatively small.

r? `@ghost`
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
  • Loading branch information
bors committed Aug 24, 2022
2 parents af5de50 + 5da72a4 commit 75dd59e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/bors.yml
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
docker_linux_tier1:
name: Docker Linux Tier1
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: true
matrix:
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:

style_check:
name: Style check
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with:
Expand All @@ -98,7 +98,7 @@ jobs:
docker_linux_tier2:
name: Docker Linux Tier2
needs: [docker_linux_tier1, style_check]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: true
max-parallel: 12
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
if: ${{ false }} # This is currently broken
name: Docker Linux Build-Std Targets
needs: [docker_linux_tier1, style_check]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: true
max-parallel: 12
Expand All @@ -179,7 +179,7 @@ jobs:
docker_switch:
name: Docker Switch
needs: [docker_linux_tier1, style_check]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with:
Expand All @@ -193,7 +193,7 @@ jobs:
build_channels_linux:
name: Build Channels Linux
needs: docker_linux_tier2
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
OS: linux
strategy:
Expand Down Expand Up @@ -277,7 +277,7 @@ jobs:
semver_linux:
if: ${{ false }} # This is currently broken
name: Semver Linux
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
continue-on-error: true
steps:
- uses: actions/checkout@v3
Expand All @@ -302,7 +302,7 @@ jobs:

docs:
name: Generate documentation
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: docker_linux_tier2
steps:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
Expand All @@ -323,7 +323,7 @@ jobs:
end_success:
name: bors build finished
if: github.event.pusher.name == 'bors' && success()
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [
docker_linux_tier1,
docker_linux_tier2,
Expand All @@ -345,7 +345,7 @@ jobs:
end_failure:
name: bors build finished
if: github.event.pusher.name == 'bors' && (failure() || cancelled())
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [
docker_linux_tier1,
docker_linux_tier2,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
upload_docs:
name: Upload documentation
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: github.repository == 'rust-lang/libc'

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
docker_linux_tier1:
name: Docker Linux Tier1
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: true
matrix:
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:

style_check:
name: Style check
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Setup Rust toolchain
Expand Down
3 changes: 3 additions & 0 deletions ci/run-docker.sh
@@ -1,5 +1,8 @@
#!/usr/bin/env sh

# Disable SC2086 as it confuses the docker command.
# shellcheck disable=SC2086

# Small script to run tests for a target (or all targets) inside all the
# respective docker images.

Expand Down

0 comments on commit 75dd59e

Please sign in to comment.