bootstrap messes with target arch

pdidev · Dec 7, 2021 · 92f8730 · 92f8730
1 parent c5cea1c
commit 92f8730
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/docker_images.yml b/.github/workflows/docker_images.yml
@@ -10,8 +10,6 @@ on:
 defaults:
   run:
     shell: bash
-env:
-  MAKEFLAGS: -j 4
 jobs:
   build_bionic:
     runs-on: ubuntu-latest
@@ -150,7 +148,7 @@ jobs:
       env:
         COMPILER: "${{ matrix.compiler }}"
         CMAKE: "${{ matrix.cmake }}"
-        MPI`: "${{ matrix.mpi }}"
+        MPI: "${{ matrix.mpi }}"
         LIBS_VERSION: "${{ matrix.libs_version }}"
       run: |
         set -ex

diff --git a/bionic/Dockerfile b/bionic/Dockerfile
@@ -59,7 +59,8 @@ SHELL ["docker-shell"]
 ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
 CMD ["interactive-shell"]
 
-RUN spack install ${SPACK_INSTALL_ARGS} --reuse patchelf target=x86_64 \
+RUN spack solve --reuse patchelf target=x86_64 \
+ && spack install ${SPACK_INSTALL_ARGS} --reuse patchelf target=x86_64 \
  && spack spec hdf5+mpi \
  && spack reindex \
  && sed 's/target:.*/target: x86_64/' -i /root/.spack/linux/compilers.yaml
diff --git a/cmake/Dockerfile b/cmake/Dockerfile
@@ -11,4 +11,5 @@ ENV CMAKE=cmake${CMAKE_VERSION}
 SHELL ["/usr/local/bin/spack-env", "/bin/bash", "-c"]
 
 RUN set -ex \
+ && spack solve --reuse "${CMAKE}%${COMPILER}" target=x86_64 \
  && spack install ${SPACK_INSTALL_ARGS} --reuse "${CMAKE}%${COMPILER}" target=x86_64
diff --git a/gcc/Dockerfile b/gcc/Dockerfile
@@ -11,7 +11,8 @@ ENV COMPILER=gcc${GCC_VERSION}
 SHELL ["/usr/local/bin/spack-env", "/bin/bash", "-c"]
 
 RUN set -ex \
- && spack install ${SPACK_INSTALL_ARGS} --reuse "${COMPILER}" target=x86_64 \
+ && spack solve --reuse "${COMPILER}" target=x86_64 ~bootstrap \
+ && spack install ${SPACK_INSTALL_ARGS} --reuse "${COMPILER}" target=x86_64 ~bootstrap \
  && spack load ${COMPILER} \
  && spack compiler find \
  && spack unload ${COMPILER} \

diff --git a/libs/Dockerfile b/libs/Dockerfile
@@ -38,4 +38,5 @@ RUN cd /opt/spack-environment \
 
 RUN cd /opt/spack-environment \
  && spack env activate . \
+ && spack solve --reuse \
  && spack install ${SPACK_INSTALL_ARGS} --reuse
diff --git a/mpi/Dockerfile b/mpi/Dockerfile
@@ -11,4 +11,5 @@ ENV MPI=${MPI}
 SHELL ["/usr/local/bin/spack-env", "/bin/bash", "-c"]
 
 RUN set -ex \
+ && spack solve --reuse "${MPI}%${COMPILER}" "^${CMAKE}" target=x86_64 \
  && spack install ${SPACK_INSTALL_ARGS} --reuse "${MPI}%${COMPILER}" "^${CMAKE}" target=x86_64