Skip to content

Commit 40f7a25

Browse files
authored
Added support for clang 12 compiler (#156)
* Added support for clang 12 compiler * Added support for g++ 11 compiler
1 parent 346fc20 commit 40f7a25

File tree

1 file changed

+56
-2
lines changed

1 file changed

+56
-2
lines changed

.github/workflows/skyr-url-ci.yml

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
cxx_standard: 20
7878
}
7979

80-
8180
# GCC-10
8281
- {
8382
name: "Linux GCC 10 Debug (C++17)", artifact: "Linux.tar.xz",
@@ -108,6 +107,22 @@ jobs:
108107
cxx_standard: 20,
109108
}
110109

110+
# GCC-11
111+
- {
112+
name: "Linux GCC 11 Debug (C++20)", artifact: "Linux.tar.xz",
113+
os: ubuntu-latest,
114+
build_type: Debug,
115+
cc: "gcc-11", cxx: "g++-11",
116+
cxx_standard: 20,
117+
}
118+
- {
119+
name: "Linux GCC 11 Release (C++20)", artifact: "Linux.tar.xz",
120+
os: ubuntu-latest,
121+
build_type: RelWithDebInfo,
122+
cc: "gcc-11", cxx: "g++-11",
123+
cxx_standard: 20,
124+
}
125+
111126
# Clang-8
112127
- {
113128
name: "Linux Clang 8 Debug (C++17)", artifact: "Linux.tar.xz",
@@ -200,6 +215,22 @@ jobs:
200215
cxx_standard: 20,
201216
}
202217

218+
# Clang-12
219+
- {
220+
name: "Linux Clang 12 Debug (C++20)", artifact: "Linux.tar.xz",
221+
os: ubuntu-latest,
222+
build_type: Debug,
223+
cc: "clang-12", cxx: "clang++-12",
224+
cxx_standard: 20,
225+
}
226+
- {
227+
name: "Linux Clang 12 Release (C++20)", artifact: "Linux.tar.xz",
228+
os: ubuntu-latest,
229+
build_type: RelWithDebInfo,
230+
cc: "clang-12", cxx: "clang++-12",
231+
cxx_standard: 20,
232+
}
233+
203234
# AppleClang
204235
- {
205236
name: "macOS Clang Debug (C++17)", artifact: "macOS.tar.xz",
@@ -325,6 +356,15 @@ jobs:
325356
sudo apt-get update
326357
sudo apt-get -y install g++-8
327358
359+
- name: Install GCC 11
360+
id: install_gcc_11
361+
if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'g++-11' )
362+
shell: bash
363+
working-directory: ${{ env.HOME }}
364+
run: |
365+
sudo apt-get update
366+
sudo apt-get -y install g++-11
367+
328368
- name: Install Clang 8
329369
id: install_clang_8
330370
if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'clang++-8' )
@@ -354,6 +394,16 @@ jobs:
354394
chmod +x llvm.sh
355395
sudo ./llvm.sh 11
356396
397+
- name: Install Clang 12
398+
id: install_clang_12
399+
if: startsWith(matrix.config.os, 'ubuntu') && ( matrix.config.cxx == 'clang++-12' )
400+
shell: bash
401+
working-directory: ${{ env.HOME }}
402+
run: |
403+
wget https://apt.llvm.org/llvm.sh
404+
chmod +x llvm.sh
405+
sudo ./llvm.sh 12
406+
357407
- name: Install vcpkg (Linux)
358408
id: vcpkg_linux
359409
if: startsWith(matrix.config.os, 'ubuntu')
@@ -428,8 +478,12 @@ jobs:
428478
"${{ matrix.config.name }}" STREQUAL "Windows MSVC 2019 Release (C++20)" OR
429479
"${{ matrix.config.name }}" STREQUAL "Linux GCC 10 Debug (C++20)" OR
430480
"${{ matrix.config.name }}" STREQUAL "Linux GCC 10 Release (C++20)" OR
481+
"${{ matrix.config.name }}" STREQUAL "Linux GCC 11 Debug (C++20)" OR
482+
"${{ matrix.config.name }}" STREQUAL "Linux GCC 11 Release (C++20)" OR
431483
"${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Debug (C++20)" OR
432-
"${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Release (C++20)"
484+
"${{ matrix.config.name }}" STREQUAL "Linux Clang 11 Release (C++20)" OR
485+
"${{ matrix.config.name }}" STREQUAL "Linux Clang 12 Debug (C++20)" OR
486+
"${{ matrix.config.name }}" STREQUAL "Linux Clang 12 Release (C++20)"
433487
)
434488
set(BUILD_V2 ON)
435489
endif()

0 commit comments

Comments
 (0)