1
0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-09 05:40:46 +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

@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
debug-options: ['ALL_DEBUG', 'NORMAL_DEBUG']
os: [ubuntu-20.04]
os: [ubuntu-22.04]
arch: ['i686', 'x86_64']
# If ccache is broken and you would like to bust the ccache cache on Github Actions, increment this:
ccache-mark: [0]
@ -39,18 +39,12 @@ jobs:
# Do we need to update the package cache first?
# sudo apt-get update -qq
- name: "Install Ubuntu dependencies"
# These packages are already part of the ubuntu-20.04 image:
# These packages are already part of the ubuntu-22.04 image:
# cmake libgmp-dev npm shellcheck
# Packages below aren't.
#
# We add the canonical-server/server-backports PPA to get updated QEMU releases without having to manage
# yet another cache in github actions
# We add the ubuntu-toolchain-r/test PPA to get gcc-11 on 20.04
run: |
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 -y clang-format-14 ccache e2fsprogs gcc-11 g++-11 libstdc++-11-dev libmpfr-dev libmpc-dev ninja-build qemu-utils qemu-system-i386 unzip
- name: Install JS dependencies

View File

@ -4,7 +4,7 @@ on: [push, pull_request_target]
jobs:
notify_discord:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: always() && github.repository == 'SerenityOS/serenity' && (github.event_name == 'pull_request_target' || (github.event_name == 'push' && github.ref == 'refs/heads/master'))
steps:

View File

@ -47,7 +47,6 @@ jobs:
- name: Install dependencies
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install -y ninja-build unzip gcc-11 g++-11 jq wget
test -e /opt/wabt-1.0.27 || (

View File

@ -7,7 +7,7 @@ on: [pull_request_target]
jobs:
lint_commits:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: always() && github.repository == 'SerenityOS/serenity'
steps:

View File

@ -8,7 +8,7 @@ on:
jobs:
convert_using_pandoc:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: always() && github.repository == 'SerenityOS/serenity' && github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v2

View File

@ -20,14 +20,13 @@ jobs:
sudo wget -O /etc/apt/sources.list.d/viva64.list https://files.pvs-studio.com/beta/etc/viva64.list
- name: "Install Ubuntu dependencies"
# These packages are already part of the ubuntu-20.04 image:
# These packages are already part of the ubuntu-22.04 image:
# cmake libgmp-dev npm shellcheck
# Packages below aren't.
#
run: |
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 -y clang-format-14 gcc-11 g++-11 libstdc++-11-dev libmpfr-dev libmpc-dev ninja-build unzip pvs-studio

View File

@ -54,13 +54,12 @@ jobs:
# TODO: Is there someway to share these steps with the cmake.yml?
- name: "Install Ubuntu dependencies"
# These packages are already part of the ubuntu-20.04 image:
# These packages are already part of the ubuntu-22.04 image:
# cmake libgmp-dev npm shellcheck
# Packages below aren't.
run: |
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 -y clang-format-14 gcc-11 g++-11 libstdc++-11-dev libmpfr-dev libmpc-dev ninja-build unzip

View File

@ -4,7 +4,7 @@ on: [ push ]
jobs:
notify_twitter:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: always() && github.repository == 'SerenityOS/serenity' && github.ref == 'refs/heads/master'
steps:

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