CI: Switch Linux runners to Ubuntu 24.04
Some checks are pending
CI / Lagom (false, FUZZ, ubuntu-24.04, Linux, Clang) (push) Waiting to run
CI / Lagom (false, NO_FUZZ, macos-14, macOS, Clang) (push) Waiting to run
CI / Lagom (false, NO_FUZZ, ubuntu-24.04, Linux, GNU) (push) Waiting to run
CI / Lagom (true, NO_FUZZ, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Package the js repl as a binary artifact / build-and-package (macos-14, macOS, macOS-universal2) (push) Waiting to run
Package the js repl as a binary artifact / build-and-package (ubuntu-24.04, Linux, Linux-x86_64) (push) Waiting to run
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Lint Code / lint (push) Waiting to run
Push notes / build (push) Waiting to run

This commit is contained in:
Timothy Flynn 2024-10-01 16:15:12 -04:00 committed by Tim Flynn
parent 04b45a8961
commit c412181683
Notes: github-actions[bot] 2024-10-02 10:42:21 +00:00
4 changed files with 13 additions and 17 deletions

View file

@ -20,12 +20,10 @@ runs:
set -e set -e
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main' sudo add-apt-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main'
sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update -y
sudo apt-get install -y autoconf autoconf-archive automake build-essential ccache clang-18 clang++-18 cmake curl fonts-liberation2 \
sudo apt-get update
sudo apt-get install autoconf autoconf-archive automake build-essential ccache clang-18 clang++-18 cmake curl fonts-liberation2 \
gcc-13 g++-13 libavcodec-dev libavformat-dev libavutil-dev libegl1-mesa-dev libgl1-mesa-dev libpulse-dev libssl-dev \ gcc-13 g++-13 libavcodec-dev libavformat-dev libavutil-dev libegl1-mesa-dev libgl1-mesa-dev libpulse-dev libssl-dev \
libstdc++-13-dev lld-18 nasm ninja-build qt6-base-dev qt6-tools-dev-tools tar unzip zip libstdc++-13-dev lld-18 nasm ninja-build qt6-base-dev qt6-tools-dev-tools tar unzip zip
@ -43,8 +41,8 @@ runs:
if: ${{ inputs.os == 'Linux' }} if: ${{ inputs.os == 'Linux' }}
shell: bash shell: bash
run: | run: |
python3 -m pip install --upgrade pip python3 -m pip install --break-system-packages --upgrade pip
pip3 install requests six pip3 install --break-system-packages requests six
- name: 'Select latest Xcode' - name: 'Select latest Xcode'
if: ${{ inputs.os == 'macOS' || inputs.os == 'Android' }} if: ${{ inputs.os == 'macOS' || inputs.os == 'Android' }}

View file

@ -14,14 +14,14 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os_name: ['Linux'] os_name: ['Linux']
os: [ubuntu-22.04] os: [ubuntu-24.04]
fuzzer: ['NO_FUZZ'] fuzzer: ['NO_FUZZ']
toolchain: ['GNU'] toolchain: ['GNU']
clang_plugins: [false] clang_plugins: [false]
include: include:
- os_name: 'Linux' - os_name: 'Linux'
os: ubuntu-22.04 os: ubuntu-24.04
fuzzer: 'NO_FUZZ' fuzzer: 'NO_FUZZ'
toolchain: 'Clang' toolchain: 'Clang'
clang_plugins: true clang_plugins: true
@ -33,7 +33,7 @@ jobs:
clang_plugins: false clang_plugins: false
- os_name: 'Linux' - os_name: 'Linux'
os: ubuntu-22.04 os: ubuntu-24.04
fuzzer: 'FUZZ' fuzzer: 'FUZZ'
toolchain: 'Clang' toolchain: 'Clang'
clang_plugins: false clang_plugins: false

View file

@ -15,7 +15,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-22.04] os: [ubuntu-24.04]
package_type: [Linux-x86_64] package_type: [Linux-x86_64]
os_name: [Linux] os_name: [Linux]
include: include:
@ -24,7 +24,7 @@ jobs:
os_name: macOS os_name: macOS
concurrency: concurrency:
group: ${{ github.workflow }}-${{ matrix.os }} group: ${{ github.workflow }}-${{ matrix.os_name }}
cancel-in-progress: true cancel-in-progress: true
steps: steps:
@ -54,9 +54,7 @@ jobs:
-DCMAKE_C_COMPILER=gcc-13 \ -DCMAKE_C_COMPILER=gcc-13 \
-DCMAKE_CXX_COMPILER=g++-13 \ -DCMAKE_CXX_COMPILER=g++-13 \
-DENABLE_GUI_TARGETS=OFF -DENABLE_GUI_TARGETS=OFF
if: ${{ matrix.os == 'ubuntu-22.04' }} if: ${{ matrix.os_name == 'Linux' }}
env:
CCACHE_DIR: ${{ env.CCACHE_DIR }}
# FIXME: Add the following flag back when vcpkg supports Universal binaries: # FIXME: Add the following flag back when vcpkg supports Universal binaries:
# -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" # -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
@ -68,7 +66,7 @@ jobs:
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" \ -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" \
-DENABLE_GUI_TARGETS=OFF -DENABLE_GUI_TARGETS=OFF
if: ${{ matrix.os == 'macos-14' }} if: ${{ matrix.os_name == 'macOS' }}
- name: Build and package js - name: Build and package js
working-directory: Build working-directory: Build

View file

@ -7,7 +7,7 @@ on: [pull_request_target]
jobs: jobs:
lint: lint:
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
if: always() && github.repository == 'LadybirdBrowser/ladybird' if: always() && github.repository == 'LadybirdBrowser/ladybird'
steps: steps: