Skip to content

Commit

Permalink
CI: Switch Linux runners to Ubuntu 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
trflynn89 committed Oct 2, 2024
1 parent 04b45a8 commit c412181
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 17 deletions.
12 changes: 5 additions & 7 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ runs:
set -e
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
sudo apt-get install autoconf autoconf-archive automake build-essential ccache clang-18 clang++-18 cmake curl fonts-liberation2 \
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 \
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
Expand All @@ -43,8 +41,8 @@ runs:
if: ${{ inputs.os == 'Linux' }}
shell: bash
run: |
python3 -m pip install --upgrade pip
pip3 install requests six
python3 -m pip install --break-system-packages --upgrade pip
pip3 install --break-system-packages requests six
- name: 'Select latest Xcode'
if: ${{ inputs.os == 'macOS' || inputs.os == 'Android' }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
fail-fast: false
matrix:
os_name: ['Linux']
os: [ubuntu-22.04]
os: [ubuntu-24.04]
fuzzer: ['NO_FUZZ']
toolchain: ['GNU']
clang_plugins: [false]

include:
- os_name: 'Linux'
os: ubuntu-22.04
os: ubuntu-24.04
fuzzer: 'NO_FUZZ'
toolchain: 'Clang'
clang_plugins: true
Expand All @@ -33,7 +33,7 @@ jobs:
clang_plugins: false

- os_name: 'Linux'
os: ubuntu-22.04
os: ubuntu-24.04
fuzzer: 'FUZZ'
toolchain: 'Clang'
clang_plugins: false
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/ladybird-js-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
package_type: [Linux-x86_64]
os_name: [Linux]
include:
Expand All @@ -24,7 +24,7 @@ jobs:
os_name: macOS

concurrency:
group: ${{ github.workflow }}-${{ matrix.os }}
group: ${{ github.workflow }}-${{ matrix.os_name }}
cancel-in-progress: true

steps:
Expand Down Expand Up @@ -54,9 +54,7 @@ jobs:
-DCMAKE_C_COMPILER=gcc-13 \
-DCMAKE_CXX_COMPILER=g++-13 \
-DENABLE_GUI_TARGETS=OFF
if: ${{ matrix.os == 'ubuntu-22.04' }}
env:
CCACHE_DIR: ${{ env.CCACHE_DIR }}
if: ${{ matrix.os_name == 'Linux' }}

# FIXME: Add the following flag back when vcpkg supports Universal binaries:
# -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
Expand All @@ -68,7 +66,7 @@ jobs:
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" \
-DENABLE_GUI_TARGETS=OFF
if: ${{ matrix.os == 'macos-14' }}
if: ${{ matrix.os_name == 'macOS' }}

- name: Build and package js
working-directory: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on: [pull_request_target]

jobs:
lint:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: always() && github.repository == 'LadybirdBrowser/ladybird'

steps:
Expand Down

0 comments on commit c412181

Please sign in to comment.