Skip to content

Commit 303881f

Browse files
committed
[CI] Add Ubuntu 22.04 to the build matrix.
1 parent dfbe41f commit 303881f

File tree

1 file changed

+78
-10
lines changed

1 file changed

+78
-10
lines changed

.github/workflows/ci.yml

+78-10
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
java: [ '8', '11', '17', '18' ]
30-
os: [ 'ubuntu-20.04', 'windows-latest' ]
30+
os: [ 'ubuntu-22.04', 'windows-latest' ]
3131
steps:
3232
- name: Checkout code
3333
uses: actions/checkout@v3
@@ -63,7 +63,7 @@ jobs:
6363

6464
csharp-build:
6565
name: C# ${{ matrix.dotnet }}
66-
runs-on: ubuntu-20.04
66+
runs-on: ubuntu-22.04
6767
strategy:
6868
fail-fast: false
6969
matrix:
@@ -104,8 +104,8 @@ jobs:
104104
- name: Pack
105105
run: ./csharp/pack.sh
106106

107-
cpp-gcc-build:
108-
name: C++ GCC ${{ matrix.version }}
107+
cpp-gcc-2004-build:
108+
name: C++ GCC ${{ matrix.version }} (Ubuntu 20.04)
109109
runs-on: ubuntu-20.04
110110
strategy:
111111
fail-fast: false
@@ -131,16 +131,50 @@ jobs:
131131
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
132132
- name: Install compiler
133133
run: |
134-
sudo add-apt-repository "deb http://dk.archive.ubuntu.com/ubuntu/ bionic main universe"
134+
sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu/ bionic main universe"
135135
sudo apt-get install -y g++-${{ matrix.version }} libsparsehash-dev libidn11
136136
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
137137
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
138138
echo "cmake-${CMAKE_VERSION}-Linux-x86_64/bin" >> $GITHUB_PATH
139139
- name: Build
140-
run: cmake --version && ./cppbuild/cppbuild
140+
run: ./cppbuild/cppbuild
141+
142+
cpp-gcc-2204-build:
143+
name: C++ GCC ${{ matrix.version }} (Ubuntu 22.04)
144+
runs-on: ubuntu-22.04
145+
strategy:
146+
fail-fast: false
147+
matrix:
148+
version: [ '9', '10', '11', '12' ]
149+
env:
150+
CC: gcc-${{ matrix.version }}
151+
CXX: g++-${{ matrix.version }}
152+
steps:
153+
- name: Checkout code
154+
uses: actions/checkout@v3
155+
- name: Cache Gradle dependencies
156+
uses: actions/cache@v3
157+
with:
158+
path: ~/.gradle/caches
159+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
160+
restore-keys: |
161+
${{ runner.os }}-gradle-
162+
- name: Cache Gradle wrappers
163+
uses: actions/cache@v3
164+
with:
165+
path: ~/.gradle/wrapper
166+
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
167+
- name: Install compiler
168+
run: |
169+
sudo apt-get install -y g++-${{ matrix.version }} libsparsehash-dev libidn11
170+
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
171+
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
172+
echo "cmake-${CMAKE_VERSION}-Linux-x86_64/bin" >> $GITHUB_PATH
173+
- name: Build
174+
run: ./cppbuild/cppbuild
141175

142-
cpp-clang-build:
143-
name: C++ Clang ${{ matrix.version }}
176+
cpp-clang-2004-build:
177+
name: C++ Clang ${{ matrix.version }} (Ubuntu 20.04)
144178
runs-on: ubuntu-20.04
145179
strategy:
146180
fail-fast: false
@@ -174,7 +208,41 @@ jobs:
174208
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
175209
echo "cmake-${CMAKE_VERSION}-Linux-x86_64/bin" >> $GITHUB_PATH
176210
- name: Build
177-
run: cmake --version && ./cppbuild/cppbuild
211+
run: ./cppbuild/cppbuild
212+
213+
cpp-clang-2204-build:
214+
name: C++ Clang ${{ matrix.version }} (Ubuntu 22.04)
215+
runs-on: ubuntu-22.04
216+
strategy:
217+
fail-fast: false
218+
matrix:
219+
version: [ '9', '10', '11', '12', '13', '14' ]
220+
env:
221+
CC: clang-${{ matrix.version }}
222+
CXX: clang++-${{ matrix.version }}
223+
steps:
224+
- name: Checkout code
225+
uses: actions/checkout@v3
226+
- name: Cache Gradle dependencies
227+
uses: actions/cache@v3
228+
with:
229+
path: ~/.gradle/caches
230+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
231+
restore-keys: |
232+
${{ runner.os }}-gradle-
233+
- name: Cache Gradle wrappers
234+
uses: actions/cache@v3
235+
with:
236+
path: ~/.gradle/wrapper
237+
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
238+
- name: Install compiler
239+
run: |
240+
sudo apt-get install -y clang-${{ matrix.version }} libsparsehash-dev libidn11
241+
curl -O -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
242+
tar xf cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
243+
echo "cmake-${CMAKE_VERSION}-Linux-x86_64/bin" >> $GITHUB_PATH
244+
- name: Build
245+
run: ./cppbuild/cppbuild
178246

179247
cpp-clang-macos-build:
180248
name: C++ Xcode ${{ matrix.version }} (macOS)
@@ -221,7 +289,7 @@ jobs:
221289

222290
rust-build:
223291
name: Rust ${{ matrix.rust }}
224-
runs-on: ubuntu-20.04
292+
runs-on: ubuntu-22.04
225293
strategy:
226294
fail-fast: false
227295
matrix:

0 commit comments

Comments
 (0)