Update to CI to deal with new version of Rego

Signed-off-by: Matthew A Johnson <[email protected]>
CHERIoT-Platform · Jun 13, 2024 · 0394396 · 0394396
1 parent 99bb9b8
commit 0394396
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,37 +17,43 @@ jobs:
             name: "Ubuntu Latest Release",
             os: "ubuntu-latest",
             build-type: Release,
-            dependencies: "sudo apt install ninja-build"
+            dependencies: "sudo apt install ninja-build",
+            defines: ""
           }
         - {
             name: "Ubuntu 20.04 Release",
             os: "ubuntu-20.04",
             build-type: Release,
-            dependencies: "sudo apt install ninja-build"
+            dependencies: "sudo apt install ninja-build",
+            defines: "-DREGOCPP_USE_CXX17=ON"
           }
         - {
             name: "macOS Release",
             os: "macos-latest",
             build-type: Release,
-            dependencies: "brew update && brew install cmake ninja"
+            dependencies: "brew update && brew install cmake ninja",
+            defines: ""
           }
         - {
             name: "Ubuntu Latest Debug",
             os: "ubuntu-latest",
             build-type: Debug,
-            dependencies: "sudo apt install ninja-build"
+            dependencies: "sudo apt install ninja-build",
+            defines: ""
           }
         - {
             name: "Ubuntu 20.04 Debug",
             os: "ubuntu-20.04",
             build-type: Debug,
-            dependencies: "sudo apt install ninja-build"
+            dependencies: "sudo apt install ninja-build",
+            defines: "-DREGOCPP_USE_CXX17=ON"
           }
         - {
             name: "macOS Debug",
             os: "macos-latest",
             build-type: Debug,
-            dependencies: "brew update && brew install cmake ninja"
+            dependencies: "brew update && brew install cmake ninja",
+            defines: ""
           }
     runs-on: ${{ matrix.config.os }}
     name: ${{ matrix.config.name }}
@@ -56,7 +62,7 @@ jobs:
     - name: Install ninja
       run: ${{ matrix.config.dependencies }}
     - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.config.build-type}} -G Ninja
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.config.build-type}} ${{matrix.config.defines}} -G Ninja
     - name: Build
       working-directory: ${{github.workspace}}/build
       # Build your program with the given configuration