From a30b1c5362fc0deef1b48f893ce8164af5532748 Mon Sep 17 00:00:00 2001 From: Nicolas Morales Date: Thu, 7 Nov 2024 15:58:13 -0500 Subject: [PATCH 1/4] use a new commit hash for spack --- ci/ubuntu20.04-gcc11-x64.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ubuntu20.04-gcc11-x64.dockerfile b/ci/ubuntu20.04-gcc11-x64.dockerfile index fcbfc4b..780eba2 100644 --- a/ci/ubuntu20.04-gcc11-x64.dockerfile +++ b/ci/ubuntu20.04-gcc11-x64.dockerfile @@ -40,7 +40,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # Now we install spack and find compilers/externals -RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 https://github.com/spack/spack.git && cd spack && git checkout 1b0631b69edbc99a9527c1d6b9a913a49e3b1523 +RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 https://github.com/spack/spack.git && cd spack && git checkout 0a4563fd0253c829fb14fd576ad0368954028d5d ADD ./ci/packages.yaml /opt/spack/etc/spack/packages.yaml RUN . /opt/spack/share/spack/setup-env.sh && spack compiler find RUN . /opt/spack/share/spack/setup-env.sh && spack external find --not-buildable && spack external list From c7fbc9cc9c8dd2bf56709f1b414ec8f72f3b1ef6 Mon Sep 17 00:00:00 2001 From: Nicolas Morales Date: Thu, 7 Nov 2024 16:12:32 -0500 Subject: [PATCH 2/4] show spack log on error --- ci/ubuntu20.04-gcc11-x64.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/ubuntu20.04-gcc11-x64.dockerfile b/ci/ubuntu20.04-gcc11-x64.dockerfile index 780eba2..4659ca9 100644 --- a/ci/ubuntu20.04-gcc11-x64.dockerfile +++ b/ci/ubuntu20.04-gcc11-x64.dockerfile @@ -55,7 +55,7 @@ RUN cd /opt/spack-environment \ RUN cd /opt/spack-environment \ && . /opt/spack/share/spack/setup-env.sh \ && spack env activate . \ - && spack install --fail-fast \ + && spack install --show-log-on-error --fail-fast \ && spack gc -y # We need to build a specific branch of VeloC until https://github.com/ECP-VeloC/VELOC/pull/43 is resolved From c5ec6613f0de124e3a6a83593334f972568d6482 Mon Sep 17 00:00:00 2001 From: Nicolas Morales Date: Thu, 7 Nov 2024 16:31:10 -0500 Subject: [PATCH 3/4] try alternate method of fetching specific commit for spack --- ci/ubuntu20.04-gcc11-x64.dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/ubuntu20.04-gcc11-x64.dockerfile b/ci/ubuntu20.04-gcc11-x64.dockerfile index 4659ca9..44a22a0 100644 --- a/ci/ubuntu20.04-gcc11-x64.dockerfile +++ b/ci/ubuntu20.04-gcc11-x64.dockerfile @@ -40,7 +40,11 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # Now we install spack and find compilers/externals -RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 https://github.com/spack/spack.git && cd spack && git checkout 0a4563fd0253c829fb14fd576ad0368954028d5d +RUN mkdir -p /opt/spack && cd /opt/spack && \ + git init && \ + git remote add origin https://github.com/spack/spack.git && \ + git fetch origin 0a4563fd0253c829fb14fd576ad0368954028d5d && \ + git checkout FETCH_HEAD ADD ./ci/packages.yaml /opt/spack/etc/spack/packages.yaml RUN . /opt/spack/share/spack/setup-env.sh && spack compiler find RUN . /opt/spack/share/spack/setup-env.sh && spack external find --not-buildable && spack external list From e606a95ac3e14efc2716ef3e1eb7ff7924f691a2 Mon Sep 17 00:00:00 2001 From: Nicolas Morales Date: Wed, 13 Nov 2024 10:49:26 -0500 Subject: [PATCH 4/4] bump spack commit to one that seems to work --- ci/ubuntu20.04-gcc11-x64.dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/ubuntu20.04-gcc11-x64.dockerfile b/ci/ubuntu20.04-gcc11-x64.dockerfile index 44a22a0..ab0839c 100644 --- a/ci/ubuntu20.04-gcc11-x64.dockerfile +++ b/ci/ubuntu20.04-gcc11-x64.dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:20.04 +ARG BASE=ubuntu:20.04 +FROM $BASE RUN apt-get update \ && DEBIAN_FRONTEND="noninteractive" apt-get install -y \ @@ -43,7 +44,7 @@ RUN apt-get update \ RUN mkdir -p /opt/spack && cd /opt/spack && \ git init && \ git remote add origin https://github.com/spack/spack.git && \ - git fetch origin 0a4563fd0253c829fb14fd576ad0368954028d5d && \ + git fetch origin 6f948eb847c46a9caea852d3ffffd9cd4575dacc && \ git checkout FETCH_HEAD ADD ./ci/packages.yaml /opt/spack/etc/spack/packages.yaml RUN . /opt/spack/share/spack/setup-env.sh && spack compiler find