Skip to content

GitLab

Unverified Commit 7be763d6 authored by Juha Reunanen's avatar Juha Reunanen Committed by GitHub
Browse files

Make GitHub actions build on gcc-11 and clang too (#2510) 

* Refactor not to use a matrix

* Add clang build

* Add job on clang-13 as well

* Disable the `gcc-11` job for now
parent 7f8731a2
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 25 deletions
.github/workflows/build_cmake.yml
View file @ 7be763d6
...@@ -11,44 +11,99 @@ env: ...@@ -11,44 +11,99 @@ env:
defaults: defaults:
run: run:
shell: bash shell: bash
working-directory: dlib/test
jobs: jobs:
build: ubuntu-latest-gcc-default:
runs-on: ${{ matrix.os }} runs-on: 'ubuntu-latest'
strategy: steps:
fail-fast: false - uses: actions/checkout@v2
matrix: - name: Configure
os: ['ubuntu-latest', 'windows-latest', 'macos-latest'] run: cmake ${{ github.workspace }}/dlib/test -B ${{ env.build_dir }}
- name: Build just tests
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --target dtest --parallel 4
- name: Test
run: ${{ env.build_dir }}/dtest --runall -q
- name: Build examples, etc
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --parallel 2
ubuntu-latest-gcc-11:
if: ${{ false }} # disabled until https://github.com/davisking/dlib/issues/2506 has been resolved
runs-on: 'ubuntu-latest'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install gcc 11
run: |
sudo apt update
sudo apt install gcc-11 g++-11
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 --slave /usr/bin/g++ g++ /usr/bin/g++-11 --slave /usr/bin/gcov gcov /usr/bin/gcov-11
- name: Configure
run: cmake ${{ github.workspace }}/dlib/test -B ${{ env.build_dir }}
- name: Build just tests
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --target dtest --parallel 4
- name: Test
run: ${{ env.build_dir }}/dtest --runall -q
- name: Build examples, etc
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --parallel 2
ubuntu-latest-clang-default:
runs-on: 'ubuntu-latest'
steps:
- uses: actions/checkout@v2
- name: Configure - name: Configure
working-directory: ${{ github.workspace }}/dlib/test
run: | run: |
if [ "$RUNNER_OS" == "macOS" ]; then export CC=/usr/bin/clang
# MacOS machines often come with low quality BLAS libraries installed, so don't use those. export CXX=/usr/bin/clang++
cmake . -B ${{ env.build_dir }} -DDLIB_USE_BLAS=0 -DDLIB_USE_LAPACK=0 cmake ${{ github.workspace }}/dlib/test -B ${{ env.build_dir }}
else - name: Build just tests
cmake . -B ${{ env.build_dir }} run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --target dtest --parallel 4
fi; - name: Test
run: ${{ env.build_dir }}/dtest --runall -q
- name: Build examples, etc
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --parallel 2
ubuntu-latest-clang-13:
runs-on: 'ubuntu-latest'
steps:
- uses: actions/checkout@v2
- name: Install clang 13
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 13
- name: Configure
run: |
export CC=/usr/bin/clang-13
export CXX=/usr/bin/clang++-13
cmake ${{ github.workspace }}/dlib/test -B ${{ env.build_dir }}
- name: Build just tests - name: Build just tests
working-directory: ${{ github.workspace }}/dlib/test
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --target dtest --parallel 4 run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --target dtest --parallel 4
- name: Test
run: ${{ env.build_dir }}/dtest --runall -q
- name: Build examples, etc
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --parallel 2
windows-latest:
runs-on: 'windows-latest'
steps:
- uses: actions/checkout@v2
- name: Configure
run: cmake . -B ${{ env.build_dir }}
- name: Build just tests
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --target dtest --parallel 4
- name: Test - name: Test
working-directory: ${{ github.workspace }}/dlib/test/${{ env.build_dir }} run: ${{ env.build_dir }}/${{ env.config }}/dtest.exe --runall -q
run: |
if [ "$RUNNER_OS" == "Windows" ]; then
./${{ env.config }}/dtest.exe --runall -q
elif [ "$RUNNER_OS" == "macOS" ]; then
./dtest --runall --no_test_timer -q
else
./dtest --runall -q
fi;
macos-latest:
runs-on: 'macos-latest'
steps:
- uses: actions/checkout@v2
- name: Configure
# MacOS machines often come with low quality BLAS libraries installed, so don't use those.
run: cmake ${{ github.workspace }}/dlib/test -B ${{ env.build_dir }} -DDLIB_USE_BLAS=0 -DDLIB_USE_LAPACK=0
- name: Build just tests
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --target dtest --parallel 4
- name: Test
run: ${{ env.build_dir }}/dtest --runall --no_test_timer -q
- name: Build examples, etc - name: Build examples, etc
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
working-directory: ${{ github.workspace }}/dlib/test
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --parallel 2 run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --parallel 2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment