External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⚗️ try to install Clang 11

Browse Source
This commit is contained in:
Niels Lohmann 2021-01-17 15:12:49 +01:00
parent ce9f6a1133
commit bac98447ec
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/ubuntu.yml vendored
View File

@ -70,9 +70,8 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: install_gcc - name: install_gcc
run: | run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt update sudo apt update
sudo apt install gcc-11 g++-11 ninja-build sudo apt install gcc-10 g++-10 ninja-build
shell: bash shell: bash
- name: cmake - name: cmake
run: cmake -S . -B build -DJSON_CI=On run: cmake -S . -B build -DJSON_CI=On
@ -87,15 +86,21 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: install_clang - name: install_ninja
run: | run: |
sudo apt update sudo apt update
sudo apt install clang-10 ninja-build sudo apt install ninja-build
shell: bash
- name: install_clang
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 11
shell: bash shell: bash
- name: cmake - name: cmake
run: cmake -S . -B build -DJSON_CI=On run: cmake -S . -B build -DJSON_CI=On
env: env:
CC: clang-10 CC: clang-11
CXX: clang++-10 CXX: clang++-11
- name: build - name: build
run: cmake --build build --target ci_test_clang --parallel 10 run: cmake --build build --target ci_test_clang --parallel 10

2
cmake/ci.cmake
View File

@ -17,7 +17,7 @@ execute_process(COMMAND ${CLANG_TIDY_TOOL} --version OUTPUT_VARIABLE CLANG_TIDY_
string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TIDY_TOOL_VERSION "${CLANG_TIDY_TOOL_VERSION}") string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TIDY_TOOL_VERSION "${CLANG_TIDY_TOOL_VERSION}")
message(STATUS "🔖 Clang-Tidy ${CLANG_TIDY_TOOL_VERSION} (${CLANG_TIDY_TOOL})") message(STATUS "🔖 Clang-Tidy ${CLANG_TIDY_TOOL_VERSION} (${CLANG_TIDY_TOOL})")
find_program(CLANG_TOOL NAMES clang++-HEAD clang++-11 clang++-10 clang++) find_program(CLANG_TOOL NAMES clang++-HEAD clang++-11 clang++)
execute_process(COMMAND ${CLANG_TOOL} --version OUTPUT_VARIABLE CLANG_TOOL_VERSION ERROR_VARIABLE CLANG_TOOL_VERSION) execute_process(COMMAND ${CLANG_TOOL} --version OUTPUT_VARIABLE CLANG_TOOL_VERSION ERROR_VARIABLE CLANG_TOOL_VERSION)
string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TOOL_VERSION "${CLANG_TOOL_VERSION}") string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TOOL_VERSION "${CLANG_TOOL_VERSION}")
message(STATUS "🔖 Clang ${CLANG_TOOL_VERSION} (${CLANG_TOOL})") message(STATUS "🔖 Clang ${CLANG_TOOL_VERSION} (${CLANG_TOOL})")