diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a387acd5f0..6673f7ea7c 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -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 diff --git a/.github/workflows/discord.yml b/.github/workflows/discord.yml index d602b8ded4..c5cd2447d3 100644 --- a/.github/workflows/discord.yml +++ b/.github/workflows/discord.yml @@ -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: diff --git a/.github/workflows/libjs-test262.yml b/.github/workflows/libjs-test262.yml index 2ae04cd89f..cce1c5001c 100644 --- a/.github/workflows/libjs-test262.yml +++ b/.github/workflows/libjs-test262.yml @@ -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 || ( diff --git a/.github/workflows/lintcommits.yml b/.github/workflows/lintcommits.yml index 7d6dfb2e07..f70dfb9e28 100644 --- a/.github/workflows/lintcommits.yml +++ b/.github/workflows/lintcommits.yml @@ -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: diff --git a/.github/workflows/manpages.yml b/.github/workflows/manpages.yml index 45d648193d..adc8dd8c3c 100644 --- a/.github/workflows/manpages.yml +++ b/.github/workflows/manpages.yml @@ -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 diff --git a/.github/workflows/pvs-studio-static-analysis.yml b/.github/workflows/pvs-studio-static-analysis.yml index afe1b90606..80c11cfb98 100644 --- a/.github/workflows/pvs-studio-static-analysis.yml +++ b/.github/workflows/pvs-studio-static-analysis.yml @@ -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 diff --git a/.github/workflows/sonar-cloud-static-analysis.yml b/.github/workflows/sonar-cloud-static-analysis.yml index 04766171e8..7233866284 100644 --- a/.github/workflows/sonar-cloud-static-analysis.yml +++ b/.github/workflows/sonar-cloud-static-analysis.yml @@ -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 diff --git a/.github/workflows/twitter.yml b/.github/workflows/twitter.yml index 56d75f9155..3c4fb788eb 100644 --- a/.github/workflows/twitter.yml +++ b/.github/workflows/twitter.yml @@ -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: 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