File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -135,7 +135,7 @@ stages:
135135 BLT_ENABLE_FIND_MPI : ON
136136
137137 ub_22_04_shared_cxx_20_py313_cmake_3_30_hdf5_2_0 :
138- containerImage : ${{ variables.ubuntu_24_04_tag }}
138+ containerImage : ${{ variables.ubuntu_22_04_tag }}
139139 COMPILER_CC : gcc
140140 COMPILER_CXX : g++
141141 COMPILER_FC : gfortran
@@ -210,7 +210,7 @@ stages:
210210 which python
211211 python3 --version
212212 # setup spack spec
213- export SPACK_SPEC="%${COMPILER_SPEC} "
213+ export SPACK_SPEC=""
214214 # mpi
215215 if [ $ENABLE_MPI = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC}+mpi"; fi
216216 if [ $ENABLE_MPI = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~mpi"; fi
@@ -244,6 +244,8 @@ stages:
244244 if [ $ENABLE_HDF5 = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^${HDF5_SPEC}"; fi
245245 # silo constraints
246246 if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^silo~mpi~python"; fi
247+ # Note: Spack 1.0 and beyond, compiler spec must be at the end
248+ export SPACK_SPEC="${SPACK_SPEC}%${COMPILER_SPEC}"
247249 # show final spec
248250 echo "SPACK SPEC:"
249251 echo $SPACK_SPEC
You can’t perform that action at this time.
0 commit comments