Tmp! Try 2.4.1 with deprecated flag

pika-org · Jan 11, 2024 · 083424e · 083424e
1 parent a0c8bfa
commit 083424e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.gitlab/docker/Dockerfile.spack_build b/.gitlab/docker/Dockerfile.spack_build
@@ -11,8 +11,8 @@ ARG NUM_PROCS
 
 COPY . ${SOURCE_DIR}
 
-# Print spack spec since not printed if the compiler image is found on jfrog
-RUN spack spec -lI $spack_spec
+## Print spack spec since not printed if the compiler image is found on jfrog
+#RUN spack spec -lI $spack_spec
 
 # Configure & Build
 RUN spack build-env $spack_spec -- bash -c "cmake -B${BUILD_DIR} ${SOURCE_DIR} \

diff --git a/.gitlab/docker/Dockerfile.spack_compiler b/.gitlab/docker/Dockerfile.spack_compiler
@@ -25,7 +25,7 @@ RUN echo "spack arch: $(spack arch)"
 
 # Install dependencies for this configuration
 ARG SPACK_SPEC
+ARG DEPRECATED=
 ENV spack_spec $SPACK_SPEC
-RUN spack spec -lI $spack_spec && \
-    spack install --fail-fast --only dependencies $spack_spec && \
+RUN spack install $DEPRECATED --fail-fast --only dependencies $spack_spec && \
     spack clean --all
diff --git a/.gitlab/includes/gcc10_apex_pipeline.yml b/.gitlab/includes/gcc10_apex_pipeline.yml
@@ -15,7 +15,8 @@ include:
     COMPILER: gcc@10.3.0
     CXXSTD: 17
     SPACK_SPEC: "pika@main +apex arch=$ARCH %${COMPILER} malloc=system cxxstd=$CXXSTD \
-                 ^apex@2.6.3~openmp~papi"
+                 ^apex@2.4.1~openmp~papi"
+    DEPRECATED: '--deprecated'
 
 gcc10_apex_spack_image:
   stage: spack_configs
@@ -32,7 +33,7 @@ gcc10_apex_spack_image:
     - echo -e "BASE_IMAGE=$PERSIST_IMAGE_NAME" >> compiler.env
   variables:
     DOCKERFILE: .gitlab/docker/Dockerfile.spack_compiler
-    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER","SPACK_SPEC"]'
+    DOCKER_BUILD_ARGS: '["BASE_IMAGE","ARCH","COMPILER","SPACK_SPEC","DEPRECATED"]'
   artifacts:
     reports:
       dotenv: compiler.env