Restore Apple ARM OpenMP CI with GCC 15

Author: quentin

.github/workflows/CI-Tests.yml

@@ -157,8 +157,7 @@ jobs:
     - name: cmake-test-64bit
       uses: ./.github/actions/cmake-test
       with:
-        # disable openmp on ARM architecture, see souffle-lang/souffle#2476
-        cmake-flags: -DSOUFFLE_DOMAIN_64BIT=ON -DSOUFFLE_USE_OPENMP=OFF
+        cmake-flags: -DSOUFFLE_DOMAIN_64BIT=ON
         n-chunks: ${{ needs.Test-Setup.outputs.n-chunks }}
         chunk: ${{ matrix.chunk }}
 

sh/setup/install_macos_arm_deps.sh

@@ -8,15 +8,13 @@ set -e
 set -x
 
 # Install requirements of MAC OS X
-brew install libtool mcpp swig bison libffi
-#brew install gcc@13
-#brew link gcc@13
+brew install libtool mcpp swig bison libffi gcc@15
 
-echo "/usr/local/opt/bison/bin:$PATH" >> $GITHUB_PATH
-echo 'PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig/"' >> $GITHUB_ENV
-#echo 'CC=gcc-13' >> $GITHUB_ENV
-#echo 'CXX=g++-13' >> $GITHUB_ENV
-echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
+echo "$(brew --prefix bison)/bin" >> "$GITHUB_PATH"
+echo "PKG_CONFIG_PATH=$(brew --prefix libffi)/lib/pkgconfig" >> "$GITHUB_ENV"
+echo "CC=$(brew --prefix gcc@15)/bin/gcc-15" >> "$GITHUB_ENV"
+echo "CXX=$(brew --prefix gcc@15)/bin/g++-15" >> "$GITHUB_ENV"
+echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> "$GITHUB_ENV"
 
 set +e
 set +x