Skip to content

Update CI container #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knoepfel merged 2 commits into from
Feb 6, 2026
Merged

Update CI container #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a9f23d
Updated container setup
knoepfel Feb 6, 2026
c7d5c51
Temporary adjustments to be reverted
knoepfel Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/actions/configure-cmake/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ runs:
# Source the container entrypoint script
. /entrypoint.sh

# Load Spack-installed GCC if necessary
# FIXME: The entrypoint.sh script should include the adjustment of PATH
# such that $(which g++) refers to the Spack-installed GCC.
if [ "$CPP_COMPILER" == "g++" ]; then
spack load gcc@15.2
CPP_COMPILER=$(which g++)
fi

cd "$GITHUB_WORKSPACE/$BUILD_PATH"
SOURCE_DIR="$GITHUB_WORKSPACE/$SOURCE_PATH"
echo "Configuring with CMake preset: $PRESET"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jobs:

- name: Configure CMake
id: configure
uses: Framework-R-D/phlex/.github/actions/configure-cmake@main
uses: knoepfel/phlex/.github/actions/configure-cmake@update-container
with:
source-path: ${{ env.local_checkout_path }}
build-path: ${{ env.local_build_path }}
Expand Down
3 changes: 2 additions & 1 deletion ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ apt-get install -y --no-install-recommends \
git \
gnupg2 \
libcurl4-openssl-dev \
libssl-dev \
locales-all \
python3 \
python3-dev \
Expand Down Expand Up @@ -161,7 +162,7 @@ set -euo pipefail
. /spack/share/spack/setup-env.sh

spack --timestamp install --fail-fast -j $parallelism -p 1 \
--no-check-signature gcc@15.2 target=x86_64_v3
--no-check-signature gcc@15.2 target=x86_64_v3 %c,cxx=gcc@13

# Make GCC external to simplify concretization
spack compiler find $(spack location -i gcc@15.2)
Expand Down
1 change: 1 addition & 0 deletions ci/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ export SPACK_DISABLE_LOCAL_CONFIG=true

. /spack/share/spack/setup-env.sh
spack env activate -d "$PHLEX_SPACK_ENV"
PATH=$(spack -E location -i gcc@15 %c,cxx=gcc@13)/bin:$PATH
4 changes: 0 additions & 4 deletions ci/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,4 @@ spack:
root:
require:
- "~x" # No graphics libraries required
# FIXME: davix requires openssl headers which are not currently
# available in the container. They are also not needed
# for Phlex development. This should be rectified.
- "~davix"
- "cxxstd=23"
Loading