Skip to content

Commit 52958d3

Browse files
committed
Check for correct compilers being used in GitHub workflows
1 parent 62fa5b3 commit 52958d3

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

.github/workflows/ubuntu-ci-x86_64-gnu.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545

4646
- name: prepare-directories
4747
run: |
48-
# DH* REVERT ME AFTER MERGE
4948
mkdir -p ${BUILD_CACHE_PATH}
5049
mkdir -p ${SOURCE_CACHE_PATH}
5150
@@ -118,9 +117,10 @@ jobs:
118117
# Add additional variants for MET packages, different from config/common/packages.yaml
119118
spack config add "packages:met:variants:+python +grib2 +graphics +lidar2nc +modis"
120119
121-
# Concretize and check for duplicates
120+
# Concretize, check for duplicates and for correct compilers being used
122121
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
123122
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
123+
spack stack check-preferred-compiler 2>&1 | tee log.check-preferred-compiler.${ENVNAME}
124124
125125
# Add and update source cache
126126
spack mirror add local-source file://${SOURCE_CACHE_PATH}/
@@ -196,9 +196,10 @@ jobs:
196196
rsync -av --exclude='install' --exclude='spack.lock' --exclude='.spack_db' ${BUILDCACHE_ENVDIR}/ ${ENVDIR}/
197197
spack env activate ${ENVDIR}
198198
199-
# Concretize and check for duplicates
200-
spack concretize --force 2>&1 | tee log.concretize.${ENVNAME}
199+
# Concretize, check for duplicates and for correct compilers being used
200+
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
201201
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
202+
spack stack check-preferred-compiler 2>&1 | tee log.check-preferred-compiler.${ENVNAME}
202203
203204
# Add binary cache back in
204205
spack mirror add local-binary file://${BUILD_CACHE_PATH}/

.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545

4646
- name: prepare-directories
4747
run: |
48-
# DH* REVERT ME AFTER MERGE
4948
mkdir -p ${BUILD_CACHE_PATH}
5049
mkdir -p ${SOURCE_CACHE_PATH}
5150
@@ -134,9 +133,10 @@ jobs:
134133
# Don't generate ecflow module when using external package
135134
spack config add "modules:default:tcl:exclude:[ecflow]"
136135
137-
# Concretize and check for duplicates
136+
# Concretize, check for duplicates and for correct compilers being used
138137
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
139138
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
139+
spack stack check-preferred-compiler 2>&1 | tee log.check-preferred-compiler.${ENVNAME}
140140
141141
# Add and update source cache
142142
spack mirror add local-source file://${SOURCE_CACHE_PATH}/
@@ -215,9 +215,10 @@ jobs:
215215
rsync -av --exclude='install' --exclude='spack.lock' --exclude='.spack_db' ${BUILDCACHE_ENVDIR}/ ${ENVDIR}/
216216
spack env activate ${ENVDIR}
217217
218-
# Concretize and check for duplicates
219-
spack concretize --force 2>&1 | tee log.concretize.${ENVNAME}
218+
# Concretize, check for duplicates and for correct compilers being used
219+
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
220220
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
221+
spack stack check-preferred-compiler 2>&1 | tee log.check-preferred-compiler.${ENVNAME}
221222
222223
# Add binary cache back in
223224
spack mirror add local-binary file://${BUILD_CACHE_PATH}/

.github/workflows/ubuntu-ci-x86_64-oneapi.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545

4646
- name: prepare-directories
4747
run: |
48-
# DH* REVERT ME AFTER MERGE
4948
mkdir -p ${BUILD_CACHE_PATH}
5049
mkdir -p ${SOURCE_CACHE_PATH}
5150
@@ -134,9 +133,10 @@ jobs:
134133
# Don't generate ecflow module when using external package
135134
spack config add "modules:default:tcl:exclude:[ecflow]"
136135
137-
# Concretize and check for duplicates
136+
# Concretize, check for duplicates and for correct compilers being used
138137
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
139138
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
139+
spack stack check-preferred-compiler 2>&1 | tee log.check-preferred-compiler.${ENVNAME}
140140
141141
# Add and update source cache
142142
spack mirror add local-source file://${SOURCE_CACHE_PATH}/
@@ -215,9 +215,10 @@ jobs:
215215
rsync -av --exclude='install' --exclude='spack.lock' --exclude='.spack_db' ${BUILDCACHE_ENVDIR}/ ${ENVDIR}/
216216
spack env activate ${ENVDIR}
217217
218-
# Concretize and check for duplicates
219-
spack concretize --force 2>&1 | tee log.concretize.${ENVNAME}
218+
# Concretize, check for duplicates and for correct compilers being used
219+
spack concretize --force --fresh 2>&1 | tee log.concretize.${ENVNAME}
220220
${SPACK_STACK_DIR}/util/show_duplicate_packages.py -i fms -i crtm -i crtm-fix -i esmf -i mapl -i py-cython -i neptune-env -i fms -i ip
221+
spack stack check-preferred-compiler 2>&1 | tee log.check-preferred-compiler.${ENVNAME}
221222
222223
# Add binary cache back in
223224
spack mirror add local-binary file://${BUILD_CACHE_PATH}/

0 commit comments

Comments
 (0)