1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 15:07:45 +00:00

Meta+CI: Upgrade to ubuntu-22.04

This commit upgrades Github Actions workers to ubuntu-22.04

As part of that change, we (currently) no longer need the backports
nor toolchain-r/test PPAs, because ubuntu-22.04 include
recent-enough version of QEMU and gcc
This commit is contained in:
Nathan Wallace 2022-05-23 16:12:57 -04:00 committed by Tim Flynn
parent 6a4b125fe5
commit 2f1029e7c4
12 changed files with 16 additions and 28 deletions

View file

@ -13,7 +13,7 @@ jobs:
- name: job_pool
${{ if eq(parameters.os, 'Linux') }}:
value: ubuntu-20.04
value: ubuntu-22.04
${{ if eq(parameters.os, 'macOS') }}:
value: macos-11

View file

@ -15,7 +15,7 @@ jobs:
value: $(Build.SourcesDirectory)/.ccache
pool:
vmImage: ubuntu-20.04
vmImage: ubuntu-22.04
steps:
- template: Setup.yml

View file

@ -7,10 +7,8 @@ steps:
- ${{ if eq(parameters.os, 'Serenity') }}:
- script: |
sudo add-apt-repository ppa:canonical-server/server-backports
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main'
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main'
sudo apt-get update
sudo apt-get install clang-format-14 ccache e2fsprogs gcc-11 g++-11 libstdc++-11-dev libmpfr-dev libmpc-dev ninja-build qemu-utils qemu-system-i386 unzip lld
displayName: 'Install Dependencies'
@ -18,9 +16,8 @@ steps:
- ${{ if eq(parameters.os, 'Linux') }}:
- script: |
sudo apt-get purge -y clang-11 clang-12 gcc-10
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-13 main'
sudo apt-get update
sudo apt-get install ccache gcc-11 g++-11 clang-13 libstdc++-11-dev ninja-build unzip

View file

@ -9,7 +9,7 @@ jobs:
value: 20GB
pool:
vmImage: ubuntu-20.04
vmImage: ubuntu-22.04
steps:
- template: Setup.yml