Skip to content

Commit cd1d1b6

Browse files
committed
Updating CI scripts
1 parent cbfadab commit cd1d1b6

File tree

1 file changed

+38
-37
lines changed

1 file changed

+38
-37
lines changed

.github/workflows/test.yml

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -29,73 +29,74 @@ jobs:
2929
- os: macos-latest
3030
- os: windows-latest
3131
- os: ubuntu-latest
32-
cc: gcc-11
33-
cxx: g++-11
32+
compiler: gcc
33+
version: 11
3434
- os: ubuntu-latest
35-
cc: gcc-12
36-
cxx: g++-12
35+
compiler: gcc
36+
version: 12
3737
- os: ubuntu-latest
38-
cc: gcc-13
39-
cxx: g++-13
40-
# See https://github.com/actions/runner-images/issues/8659
41-
# - os: ubuntu-latest
42-
# cc: clang-13
43-
# cxx: clang++-13
44-
# - os: ubuntu-latest
45-
# cc: clang-14
46-
# cxx: clang++-14
38+
compiler: gcc
39+
version: 13
4740
- os: ubuntu-latest
48-
cc: clang-15
49-
cxx: clang++-15
41+
compiler: clang
42+
version: 13
43+
- os: ubuntu-latest
44+
compiler: clang
45+
version: 14
46+
- os: ubuntu-latest
47+
compiler: clang
48+
version: 15
49+
- os: ubuntu-latest
50+
compiler: clang
51+
version: 16
52+
- os: ubuntu-latest
53+
compiler: clang
54+
version: 17
5055

5156
steps:
5257
- name: Checkout
53-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5459

5560
- name: System Setup
5661
shell: bash
5762
run: |
5863
if [[ '${{ matrix.os }}' == 'ubuntu-latest' ]]; then
59-
if [[ '${{ matrix.cc }}' == 'clang-15' ]]; then
60-
sudo apt-get update
61-
sudo apt-get install -y clang-15 clang++-15
64+
if [[ '${{ matrix.compiler }}' == 'clang' ]]; then
65+
wget https://apt.llvm.org/llvm.sh
66+
chmod u+x llvm.sh
67+
sudo ./llvm.sh ${{ matrix.version }}
6268
fi
6369
64-
if [[ '${{ matrix.cc }}' == 'gcc-12' ]]; then
70+
if [[ '${{ matrix.compiler }}' == 'gcc' ]]; then
6571
sudo apt-get update
66-
sudo apt-get install -y gcc-12 g++-12
67-
fi
68-
69-
if [[ '${{ matrix.cc }}' == 'gcc-13' ]]; then
70-
sudo apt-get update
71-
sudo apt-get install -y gcc-13 g++-13
72+
sudo apt-get install -y gcc-${{ matrix.version }} g++-${{ matrix.version }}
7273
fi
7374
fi
7475
7576
- name: Configure
7677
shell: bash
7778
run: |
78-
if [[ '${{ matrix.cc }}' != '' ]]; then
79-
export CC=${{ matrix.cc }}
80-
fi
81-
if [[ '${{ matrix.cxx }}' != '' ]]; then
82-
export CXX=${{ matrix.cxx }}
83-
fi
8479
cmake -S . -B out -DCMAKE_BUILD_TYPE=$BUILD_TYPE
8580
8681
- name: Build and Test
8782
shell: bash
8883
run: cmake --build out --config $BUILD_TYPE --target run-test
8984

9085
android:
91-
runs-on: macos-latest
86+
runs-on: ubuntu-latest
9287

9388
steps:
9489
- name: Checkout
95-
uses: actions/checkout@v3
90+
uses: actions/checkout@v4
91+
92+
- name: Enable KVM
93+
run: |
94+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
95+
sudo udevadm control --reload-rules
96+
sudo udevadm trigger --name-match=kvm
9697
9798
- name: AVD cache
98-
uses: actions/cache@v3
99+
uses: actions/cache@v4
99100
id: avd-cache
100101
with:
101102
path: |
@@ -138,10 +139,10 @@ jobs:
138139

139140
steps:
140141
- name: Checkout
141-
uses: actions/checkout@v3
142+
uses: actions/checkout@v4
142143

143144
- name: Set Up Emscripten
144-
uses: mymindstorm/setup-emsdk@v12
145+
uses: mymindstorm/setup-emsdk@v14
145146
with:
146147
version: 3.1.26
147148
actions-cache-folder: 'emsdk-cache'

0 commit comments

Comments
 (0)