Only use charm built with gcc on CI

On both local and Wheeler, I've been using charm built with gcc but SpECTRE built with clang and I've had no issues
sxs-collaboration · Feb 1, 2023 · 47b8a73 · 47b8a73
1 parent 77a7a66
commit 47b8a73
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/.github/workflows/Tests.yaml b/.github/workflows/Tests.yaml
@@ -225,7 +225,7 @@ jobs:
           -D CMAKE_C_COMPILER=clang
           -D CMAKE_CXX_COMPILER=clang++
           -D CMAKE_Fortran_COMPILER=gfortran-9
-          -D CHARM_ROOT=/work/charm_7_0_0/multicore-linux-x86_64-clang
+          -D CHARM_ROOT=${CHARM_ROOT}
           -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
           -D OVERRIDE_ARCH=x86-64
           -D USE_CCACHE=OFF
@@ -266,7 +266,7 @@ jobs:
           -D CMAKE_C_COMPILER=clang
           -D CMAKE_CXX_COMPILER=clang++
           -D CMAKE_Fortran_COMPILER=gfortran-9
-          -D CHARM_ROOT=/work/charm_7_0_0/multicore-linux-x86_64-clang
+          -D CHARM_ROOT=${CHARM_ROOT}
           -D CMAKE_BUILD_TYPE=Debug
           -D DEBUG_SYMBOLS=OFF
           -D BUILD_PYTHON_BINDINGS=ON
@@ -454,7 +454,6 @@ ${{ env.CACHE_KEY_SUFFIX }}"
 
           if [[ ${{ matrix.compiler }} =~ (gcc|clang)-([0-9\.]+) ]]; then
             CC=${BASH_REMATCH[1]}-${BASH_REMATCH[2]};
-            CHARM_CC=${BASH_REMATCH[1]};
             if [[ ${BASH_REMATCH[1]} = gcc ]]; then
               CXX=g++-${BASH_REMATCH[2]};
               FC=gfortran-${BASH_REMATCH[2]};
@@ -468,8 +467,6 @@ ${{ env.CACHE_KEY_SUFFIX }}"
           BUILD_SHARED_LIBS=${{ matrix.BUILD_SHARED_LIBS }}
           PYTHON_EXECUTABLE=${{ matrix.PYTHON_EXECUTABLE }}
           CMAKE_EXECUTABLE=${{ matrix.CMAKE_EXECUTABLE }}
-          CHARM_DIR_DEFAULT=/work/charm_7_0_0/multicore-linux-x86_64-
-          CHARM_DIR=${{ matrix.CHARM_DIR }}
           ASAN=${{ matrix.ASAN }}
           MEMORY_ALLOCATOR=${{ matrix.MEMORY_ALLOCATOR }}
           UBSAN_UNDEFINED=${{ matrix.UBSAN_UNDEFINED }}
@@ -485,7 +482,7 @@ ${{ env.CACHE_KEY_SUFFIX }}"
           -D CMAKE_Fortran_COMPILER=${FC}
           -D CMAKE_CXX_FLAGS="${CXXFLAGS} ${{ matrix.EXTRA_CXX_FLAGS }}"
           -D OVERRIDE_ARCH=x86-64
-          -D CHARM_ROOT=${CHARM_DIR:-${CHARM_DIR_DEFAULT}}${CHARM_CC}
+          -D CHARM_ROOT=${CHARM_ROOT}
           -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
           -D DEBUG_SYMBOLS=OFF
           -D UNIT_TESTS_IN_TEST_EXECUTABLES=OFF
@@ -620,7 +617,6 @@ ${{ env.CACHE_KEY_SUFFIX }}"
 
           if [[ ${{ matrix.compiler }} =~ (gcc|clang)-([0-9\.]+) ]]; then
             CC=${BASH_REMATCH[1]}-${BASH_REMATCH[2]};
-            CHARM_CC=${BASH_REMATCH[1]};
             if [[ ${BASH_REMATCH[1]} = gcc ]]; then
               CXX=g++-${BASH_REMATCH[2]};
               FC=gfortran-${BASH_REMATCH[2]};
@@ -640,7 +636,7 @@ ${{ env.CACHE_KEY_SUFFIX }}"
           -D CMAKE_CXX_FLAGS="${CXXFLAGS} ${{ matrix.EXTRA_CXX_FLAGS }}"
           -D OVERRIDE_ARCH=x86-64
           -D BUILD_SHARED_LIBS=ON
-          -D CHARM_ROOT=/work/charm_7_0_0/multicore-linux-x86_64-${CHARM_CC}
+          -D CHARM_ROOT=${CHARM_ROOT}
           -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
           -D DEBUG_SYMBOLS=OFF
           -D UNIT_TESTS_IN_TEST_EXECUTABLES=OFF
@@ -1030,7 +1026,6 @@ ${{ env.CACHE_KEY_SUFFIX }}"
             mkdir $BUILD_DIR && cd $BUILD_DIR
             if [[ ${{ matrix.compiler }} =~ (gcc|clang)-([0-9\.]+) ]]; then
               CC=${BASH_REMATCH[1]}-${BASH_REMATCH[2]};
-              CHARM_CC=${BASH_REMATCH[1]};
               if [[ ${BASH_REMATCH[1]} = gcc ]]; then
                 CXX=g++-${BASH_REMATCH[2]};
                 FC=gfortran-${BASH_REMATCH[2]};
@@ -1046,7 +1041,7 @@ ${{ env.CACHE_KEY_SUFFIX }}"
             -D CMAKE_Fortran_COMPILER=${FC}\
             -D CMAKE_CXX_FLAGS="${CXXFLAGS}"\
             -D OVERRIDE_ARCH=${OVERRIDE_ARCH}\
-            -D CHARM_ROOT=/work/charm_7_0_0/multicore-linux-x86_64-${CHARM_CC}\
+            -D CHARM_ROOT=${CHARM_ROOT}\
             -D CMAKE_BUILD_TYPE=Debug\
             -D DEBUG_SYMBOLS=OFF\
             -D STRIP_SYMBOLS=ON\