Skip to content

Commit 2610c9d

Browse files
committed
Explicitly load GCC 15.2 when necessary
1 parent 320d154 commit 2610c9d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.github/actions/configure-cmake/action.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ runs:
4646
run: |
4747
# Source the container entrypoint script
4848
. /entrypoint.sh
49+
50+
# Load Spack-installed GCC if necessary
51+
if [ "$CPP_COMPILER" == "g++" ]
52+
spack load gcc@15.2
53+
CPP_COMPILER=$(which g++)
54+
fi
55+
4956
cd "$GITHUB_WORKSPACE/$BUILD_PATH"
5057
SOURCE_DIR="$GITHUB_WORKSPACE/$SOURCE_PATH"
5158
echo "Configuring with CMake preset: $PRESET"

.github/workflows/cmake-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ jobs:
217217

218218
- name: Configure CMake
219219
id: configure
220-
uses: Framework-R-D/phlex/.github/actions/configure-cmake@main
220+
uses: knoepfel/phlex/.github/actions/configure-cmake@cpp23-for-containers
221221
with:
222222
source-path: ${{ env.local_checkout_path }}
223223
build-path: ${{ env.local_build_path }}

0 commit comments

Comments
 (0)