Skip to content

Commit

Permalink
Use clang on Ubuntu 22 CI and add Ubuntu 24
Browse files Browse the repository at this point in the history
Ubuntu 22 uses gcc 11 which breaks agi::fs::path due to
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95048

To still have a CI that tests gcc, also add Ubuntu 24.

ubuntu-latest currently still uses Ubuntu 22, but will switch to 24
soon: actions/runner-images#10636
  • Loading branch information
arch1t3cht committed Dec 26, 2024
1 parent b005c20 commit 9a5aa7e
Showing 1 changed file with 24 additions and 5 deletions.
29 changes: 24 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,26 @@ jobs:
# msvc: false
#}
- {
name: Ubuntu Debug,
os: ubuntu-latest,
name: Ubuntu 22 Debug,
os: ubuntu-22.04,
buildtype: debugoptimized,
args: ''
}
- {
name: Ubuntu Release,
os: ubuntu-latest,
name: Ubuntu 22 Release,
os: ubuntu-22.04,
buildtype: release,
args: ''
}
- {
name: Ubuntu 24 Debug,
os: ubuntu-24.04,
buildtype: debugoptimized,
args: ''
}
- {
name: Ubuntu 24 Release,
os: ubuntu-24.04,
buildtype: release,
args: ''
}
Expand Down Expand Up @@ -116,11 +128,18 @@ jobs:
brew install pulseaudio # NO OpenAL in github CI
- name: Install dependencies (Linux)
if: matrix.config.os == 'ubuntu-latest'
if: startsWith(matrix.config.os, 'ubuntu-')
run: |
sudo apt-get update
sudo apt-get install ninja-build build-essential libx11-dev libwxgtk3.0-gtk3-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libcurl4-openssl-dev libuchardet-dev
- name: Set compiler (Linux)
if: matrix.config.os == 'ubuntu-22.04'
run: |
# We need to use Clang on Ubuntu 22 to avoid a bug with GCC 11
echo "CC=clang" >> $GITHUB_ENV
echo "CXX=clang++" >> $GITHUB_ENV
- name: Configure
run: meson setup build ${{ matrix.config.args }} -Dbuildtype=${{ matrix.config.buildtype }} ${{ github.ref_type == 'tag' && '-Dofficial_release=true' || '' }}

Expand Down

0 comments on commit 9a5aa7e

Please sign in to comment.