Skip to content

Commit d040683

Browse files
committed
Use clang on Ubuntu 22 CI and add Ubuntu 24
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
1 parent 509b89e commit d040683

File tree

1 file changed

+25
-6
lines changed

1 file changed

+25
-6
lines changed

.github/workflows/ci.yml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,26 @@ jobs:
4040
# msvc: false
4141
#}
4242
- {
43-
name: Ubuntu Debug,
44-
os: ubuntu-latest,
43+
name: Ubuntu 22 Debug,
44+
os: ubuntu-22.04,
4545
buildtype: debugoptimized,
4646
args: ''
4747
}
4848
- {
49-
name: Ubuntu Release,
50-
os: ubuntu-latest,
49+
name: Ubuntu 22 Release,
50+
os: ubuntu-22.04,
51+
buildtype: release,
52+
args: ''
53+
}
54+
- {
55+
name: Ubuntu 24 Debug,
56+
os: ubuntu-24.04,
57+
buildtype: debugoptimized,
58+
args: ''
59+
}
60+
- {
61+
name: Ubuntu 24 Release,
62+
os: ubuntu-24.04,
5163
buildtype: release,
5264
args: ''
5365
}
@@ -116,10 +128,17 @@ jobs:
116128
brew install pulseaudio # NO OpenAL in github CI
117129
118130
- name: Install dependencies (Linux)
119-
if: matrix.config.os == 'ubuntu-latest'
131+
if: startsWith(matrix.config.os, 'ubuntu-')
120132
run: |
121133
sudo apt-get update
122-
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
134+
sudo apt-get install ninja-build build-essential libx11-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libcurl4-openssl-dev libuchardet-dev ${{ matrix.config.os == 'ubuntu-22.04' && 'libwxgtk3.0-gtk3-dev' || 'libwxgtk3.2-dev' }}
135+
136+
- name: Set compiler (Linux)
137+
if: matrix.config.os == 'ubuntu-22.04'
138+
run: |
139+
# We need to use Clang on Ubuntu 22 to avoid a bug with GCC 11
140+
echo "CC=clang" >> $GITHUB_ENV
141+
echo "CXX=clang++" >> $GITHUB_ENV
123142
124143
- name: Configure
125144
run: meson setup build ${{ matrix.config.args }} -Dbuildtype=${{ matrix.config.buildtype }} ${{ github.ref_type == 'tag' && '-Dofficial_release=true' || '' }}

0 commit comments

Comments
 (0)