Specify macos version

bernedom · Feb 11, 2025 · d67bae5 · d67bae5
1 parent 3a6d609
commit d67bae5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
             compiler-name-conan: clang
 
           - name: macos-apple-clang
-            os: macos-latest
+            os: macos-14
             compiler-cppstd: "gnu17"
 
           - name: windows-msvc-19

diff --git a/test/compilation-tests.sh b/test/compilation-tests.sh
@@ -7,13 +7,14 @@ INSTALL_PATH=$(realpath ~/SI-install)
 
 buildSingleTarget()
 {
+        set -x
     if [ "${2}" == "DEFAULTBUILD" ]; then
         cmake ${ROOT_DIR}/test/src/compilation_tests/ -B${BUILD_DIR} -DCMAKE_PREFIX_PATH=${BUILD_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} -DCMAKE_BUILD_TYPE=Release -G Ninja > /dev/null
-        assertEquals "Configuration successful" 0 $?
+        assertEquals "Configuration for defaultbuild successful" 0 $?
 
     else
         cmake ${ROOT_DIR}/test/src/compilation_tests/ -B${BUILD_DIR} -DCMAKE_PREFIX_PATH=${BUILD_DIR} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PATH} -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-DSI_DISABLE_IMPLICIT_RATIO_CONVERSION" -G Ninja > /dev/null
-        assertEquals "Configuration successful" 0 $?
+        assertEquals "Configuration for build with disabled ration cinversion successful" 0 $?
     fi
 
     cmake --build ${BUILD_DIR} --config Release --target $1 > /dev/null
@@ -24,6 +25,7 @@ buildSingleTarget()
     else
         assertNotEquals "Building fails" 0 $RESULT
     fi
+    set +x
 }
 
 oneTimeSetUp(){