update ci (#9)

eth-cscs · May 28, 2024 · fc6b286 · fc6b286
1 parent 8804535
commit fc6b286
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/ci/ci-common.yml b/ci/ci-common.yml
@@ -29,8 +29,8 @@ stages:
  reports:
  dotenv: build.env
  variables:
- SPACK_SHA: 8160a96b27aadf726f4368fe10fe79ceda8007d3
- SPACK_BUILDCACHE: develop-2024-05-05
+ SPACK_SHA: develop-2024-05-26
+ SPACK_BUILDCACHE: develop-2024-05-26
  SPACK_DLAF_FORTRAN_REPO: ./spack
  DOCKER_BUILD_ARGS: '[
  "BASE_IMAGE",

diff --git a/ci/docker/build.Dockerfile b/ci/docker/build.Dockerfile
@@ -14,11 +14,11 @@ RUN apt-get -yqq update && \
  apt-get -yqq install --no-install-recommends \
  software-properties-common \
  build-essential gfortran \
- autoconf automake ninja-build pkg-config \
+ autoconf automake libssl-dev ninja-build pkg-config \
  ${EXTRA_APTGET} \
  gawk \
  python3 python3-distutils \
- git tar wget curl libcurl4-openssl-dev ca-certificates gpg-agent jq tzdata \
+ git tar wget curl ca-certificates gpg-agent jq tzdata \
  patchelf unzip file gnupg2 libncurses-dev && \
  rm -rf /var/lib/apt/lists/*
 
@@ -45,7 +45,6 @@ RUN spack external find \
  automake \
  bzip2 \
  cuda \
- curl \
  diffutils \
  findutils \
  git \
@@ -59,7 +58,7 @@ RUN spack external find \
 
 # Enable Spack build cache
 ARG SPACK_BUILDCACHE
-RUN spack mirror add develop-2024-03-24 https://binaries.spack.io/${SPACK_BUILDCACHE}
+RUN spack mirror add ${SPACK_BUILDCACHE} https://binaries.spack.io/${SPACK_BUILDCACHE}
 RUN spack buildcache keys --install --trust
 
 # Add custom Spack repo

diff --git a/ci/docker/common.yaml b/ci/docker/common.yaml
@@ -11,6 +11,9 @@
 packages:
  all:
  target: [x86_64]
+ require:
+ - "platform=linux"
+ - "os=ubuntu22.04"
  blas:
  require: 'intel-oneapi-mkl'
  lapack: