Move strategy into job.

[stg.git] / .github / workflows / buildtest.yml

diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml
index 232dcfbfc9d2a20093c2c6cb81c5668567504c5c..ac41663c99651c830892c7778404da2d9af25ced 100644 (file)
--- a/.github/workflows/buildtest.yml
+++ b/.github/workflows/buildtest.yml
@@ -14,6 +14,12 @@ jobs:
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ubuntu-latest
 
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ubuntu-latest
 

+    strategy:
+      matrix:
+        compiler:
+          - { CC: gcc, CXX: g++ }
+          - { CC: clang, CXX: clang++ }
+

     steps:
     - uses: actions/checkout@v2
 
     steps:
     - uses: actions/checkout@v2
 


@@ -23,17 +29,20 @@ jobs:
       run: cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Install Boost
       run: cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Install Boost

-      run: sudo apt install boost-dev
+      run: sudo apt install libboost-all-dev

 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
       # access regardless of the host operating system
       shell: bash
       working-directory: ${{runner.workspace}}/build
 
     - name: Configure CMake
       # Use a bash shell so we can use the same syntax for environment variable
       # access regardless of the host operating system
       shell: bash
       working-directory: ${{runner.workspace}}/build

+      env:
+        CC: ${{ matrix.compiler.CC }}
+        CXX: ${{ matrix.compiler.CXX }}

       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12

-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_TESTS=ON -DBUILD_LIB_CONFFILES=ON -DBUILD_LIB_CRYPTO=ON -DBUILD_LIB_COMMON=ON
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_TESTS=ON -DBUILD_LIB_CONFFILES=ON -DBUILD_LIB_CRYPTO=ON -DBUILD_LIB_COMMON=ON -DBUILD_LIB_LOGGER=ON -DBUILD_LIB_SCRIPTEXECUTER=ON

 
     - name: Build
       working-directory: ${{runner.workspace}}/build
 
     - name: Build
       working-directory: ${{runner.workspace}}/build


@@ -46,4 +55,4 @@ jobs:
       shell: bash
       # Execute tests defined by the CMake configuration.
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       shell: bash
       # Execute tests defined by the CMake configuration.
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail

-      run: ctest -C $BUILD_TYPE
+      run: ctest -C $BUILD_TYPE --rerun-failed --output-on-failure