File tree Expand file tree Collapse file tree 1 file changed +25
-6
lines changed Expand file tree Collapse file tree 1 file changed +25
-6
lines changed Original file line number Diff line number Diff line change @@ -40,14 +40,26 @@ jobs:
40
40
# msvc: false
41
41
# }
42
42
- {
43
- name : Ubuntu Debug,
44
- os : ubuntu-latest ,
43
+ name : Ubuntu 22 Debug,
44
+ os : ubuntu-22.04 ,
45
45
buildtype : debugoptimized,
46
46
args : ' '
47
47
}
48
48
- {
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,
51
63
buildtype : release,
52
64
args : ' '
53
65
}
@@ -116,10 +128,17 @@ jobs:
116
128
brew install pulseaudio # NO OpenAL in github CI
117
129
118
130
- name : Install dependencies (Linux)
119
- if : matrix.config.os == 'ubuntu-latest'
131
+ if : startsWith( matrix.config.os, 'ubuntu-')
120
132
run : |
121
133
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
123
142
124
143
- name : Configure
125
144
run : meson setup build ${{ matrix.config.args }} -Dbuildtype=${{ matrix.config.buildtype }} ${{ github.ref_type == 'tag' && '-Dofficial_release=true' || '' }}
You can’t perform that action at this time.
0 commit comments