Merge pull request #154 from imperialCHEPI/ci_clang

Add clang and latest gcc to CI system

.github/workflows/ci.yml

@@ -23,33 +23,65 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2022]
         include:
-          - os: ubuntu-22.04
-            platform: linux
-          - os: windows-2022
-            platform: windows
+          - platform: linux
+            os: ubuntu-22.04
+            compiler: gcc-default
+            is_main: true
+          - platform: linux
+            os: ubuntu-22.04
+            compiler: gcc-latest
+            is_main: false
+          - platform: linux
+            os: ubuntu-22.04
+            compiler: clang
+            is_main: false
+          - platform: windows
+            os: windows-2022
+            compiler: msvc
+            is_main: true
 
     env:
       VCPKG_ROOT: "vcpkg"
       VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
 
+      # Update when there is a new version of gcc available
+      LATEST_GCC_VERSION: 13
+
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up MSVC (Windows)
-        if: matrix.os == 'windows-2022'
+        if: matrix.platform == 'windows'
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x64
 
       - name: Install dependencies (Linux)
-        if: matrix.os == 'ubuntu-22.04'
+        if: matrix.platform == 'linux'
         run: |
           sudo apt update
           sudo apt upgrade -y
           sudo apt install --no-install-recommends build-essential libtbb-dev ninja-build doxygen graphviz
 
+      - name: Install latest gcc (Linux)
+        if: matrix.compiler == 'gcc-latest'
+        run: |
+          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+          sudo apt-get update
+          sudo apt-get install g++-$LATEST_GCC_VERSION
+
+          # Use environment variable to tell CMake to compile with this version of gcc
+          echo CXX=g++-$LATEST_GCC_VERSION >> "$GITHUB_ENV"
+
+      - name: Install clang (Linux)
+        if: matrix.platform == 'linux' && matrix.compiler == 'clang'
+        run: |
+          sudo apt install --no-install-recommends clang
+
+          # Use environment variable to tell CMake to compile with clang
+          echo CXX=clang++ >> "$GITHUB_ENV"
+
       - name: Install VCPKG
         run: |
           git clone https://github.com/Microsoft/vcpkg.git
@@ -69,6 +101,7 @@ jobs:
           cmake --build --preset=release-build-${{ matrix.platform }} --target=install
 
       - name: Upload artifacts
+        if: matrix.is_main
         uses: actions/upload-artifact@v3
         with:
           name: health-gps-${{ matrix.platform }}
@@ -79,20 +112,20 @@ jobs:
         run: ctest --preset=core-test-${{ matrix.platform }}
 
       - name: Zip output folder
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && matrix.is_main
         working-directory: ${{github.workspace}}/out/install/${{ matrix.platform }}-release/bin/
         run: |
           mkdir ${{github.workspace}}/artifact
           7z a -tzip ${{github.workspace}}/artifact/health_gps_${{ matrix.platform }}.zip *.dll *.Console*
 
       - name: Upload release artifacts
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && matrix.is_main
         uses: softprops/action-gh-release@v1
         with:
           files: artifact/health_gps_${{ matrix.platform }}.zip
 
       - name: Doxygen release API deploy
-        if: matrix.platform == 'linux' && startsWith(github.ref, 'refs/tags/')
+        if: matrix.compiler == 'gcc-default' && startsWith(github.ref, 'refs/tags/')
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -5,6 +5,10 @@ repos:
       - id: check-merge-conflict
       - id: check-json
       - id: check-yaml
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.23.3
+    hooks:
+      - id: check-github-workflows
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v16.0.6
     hooks:

src/HealthGPS/energy_balance_model.cpp

@@ -51,7 +51,7 @@ void EnergyBalanceModel::update_risk_factors(RuntimeContext &context) {
             current_risk_factors.at(age_key) = model_age;
         }
 
-        double energy_intake = 0.0;
+        [[maybe_unused]] double energy_intake = 0.0;
         std::unordered_map<core::Identifier, double> nutrient_intakes;
 
         // Initialise nutrients to zero.