diff options
| author | Nathan Wallace <dev@nathanbw.com> | 2022-05-23 16:12:57 -0400 |
|---|---|---|
| committer | Tim Flynn <trflynn89@pm.me> | 2022-05-24 06:30:57 -0400 |
| commit | 2f1029e7c40c68284192c0a31b0da87edb58ed20 (patch) | |
| tree | 0151f7cf3ba1b16e45c5dbece47a76e2f874d018 /Meta/Azure | |
| parent | 6a4b125fe50aaa3f59fdcc09f34b17ba23d49666 (diff) | |
| download | serenity-2f1029e7c40c68284192c0a31b0da87edb58ed20.zip | |
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
Diffstat (limited to 'Meta/Azure')
| -rw-r--r-- | Meta/Azure/Lagom.yml | 2 | ||||
| -rw-r--r-- | Meta/Azure/Serenity.yml | 2 | ||||
| -rw-r--r-- | Meta/Azure/Setup.yml | 7 | ||||
| -rw-r--r-- | Meta/Azure/Toolchain.yml | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/Meta/Azure/Lagom.yml b/Meta/Azure/Lagom.yml index 10f5ca2244..431b8561d8 100644 --- a/Meta/Azure/Lagom.yml +++ b/Meta/Azure/Lagom.yml @@ -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 diff --git a/Meta/Azure/Serenity.yml b/Meta/Azure/Serenity.yml index 748bdf5439..680d8a58ca 100644 --- a/Meta/Azure/Serenity.yml +++ b/Meta/Azure/Serenity.yml @@ -15,7 +15,7 @@ jobs: value: $(Build.SourcesDirectory)/.ccache pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 steps: - template: Setup.yml diff --git a/Meta/Azure/Setup.yml b/Meta/Azure/Setup.yml index b10ec1e549..4e2db7a29a 100644 --- a/Meta/Azure/Setup.yml +++ b/Meta/Azure/Setup.yml @@ -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 diff --git a/Meta/Azure/Toolchain.yml b/Meta/Azure/Toolchain.yml index 02a8d5322a..3e76767522 100644 --- a/Meta/Azure/Toolchain.yml +++ b/Meta/Azure/Toolchain.yml @@ -9,7 +9,7 @@ jobs: value: 20GB pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 steps: - template: Setup.yml |