Skip to content

Commit

Permalink
update to newer version of cache, etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
mahf708 committed Jan 27, 2025
1 parent 7607c10 commit ebb77f2
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ghci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ on:

env:
GCC_VERSION: "11.4.0"
MPICH_VERSION: "4.2.1"
MPICH_VERSION: "4.2.3"
SZIP_VERSION: "2.1.1"
HDF5_VERSION: "1.12.3"
NETCDFC_VERSION: "4.9.2"
NETCDFCXX_VERSION: "4.2"
NETCDFFORTRAN_VERSION: "4.6.1"
PNETCDF_VERSION: "1.12.1"
PNETCDF_VERSION: "1.12.3"

jobs:
ocis:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/standalone-ghci.yaml.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ on:

env:
GCC_VERSION: "11.4.0"
MPICH_VERSION: "4.2.1"
MPICH_VERSION: "4.2.3"
SZIP_VERSION: "2.1.1"
HDF5_VERSION: "1.12.3"
NETCDFC_VERSION: "4.9.2"
NETCDFCXX_VERSION: "4.2"
NETCDFFORTRAN_VERSION: "4.6.1"
PNETCDF_VERSION: "1.12.1"
PNETCDF_VERSION: "1.12.3"

jobs:
ocis:
Expand Down
16 changes: 8 additions & 8 deletions ghci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM ghcr.io/e3sm-project/containers-inputdata-files:main

ARG GCC_VERSION=11.4.0
ARG MPICH_VERSION=4.2.1
ARG MPICH_VERSION=4.2.3
ARG SZIP_VERSION=2.1.1
ARG HDF5_VERSION=1.12.3
ARG NETCDFC_VERSION=4.9.2
ARG NETCDFCXX_VERSION=4.2
ARG NETCDFFORTRAN_VERSION=4.6.1
ARG PNETCDF_VERSION=1.12.1
ARG PNETCDF_VERSION=1.12.3

ENV GCC_VERSION=${GCC_VERSION}
ENV MPICH_VERSION=${MPICH_VERSION}
Expand Down Expand Up @@ -78,14 +78,14 @@ RUN mkdir -p /opt/spack-environment \
&& echo "") > /opt/spack-environment/spack.yaml

# TODO: do these intervene with each other?
# https://cache.spack.io/tag/v0.22.2/
RUN spack mirror add v0.22.2 https://binaries.spack.io/v0.22.2
# https://cache.spack.io/tag/v0.23.0/
RUN spack mirror add v0.23.0 https://binaries.spack.io/v0.23.0
RUN spack buildcache keys --install --trust
# https://cache.spack.io/tag/v0.22.1/?stack=e4s
RUN spack mirror add v0.22.2-e4s https://binaries.spack.io/v0.22.2/e4s
# https://cache.spack.io/tag/v0.23.0/?stack=e4s
RUN spack mirror add v0.23.0-e4s https://binaries.spack.io/v0.23.0/e4s
RUN spack buildcache keys --install --trust
# https://cache.spack.io/tag/v0.22.2/?stack=root#
RUN spack mirror add v0.22.2-root https://binaries.spack.io/v0.22.2/root
# https://cache.spack.io/tag/v0.23.0/?stack=root#
RUN spack mirror add v0.23.0-root https://binaries.spack.io/v0.23.0/root
RUN spack buildcache keys --install --trust

# TODO: add e4s inventory when they support ubuntu 22.04+
Expand Down
16 changes: 8 additions & 8 deletions standalone-ghci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM ghcr.io/e3sm-project/containers-inputdata-files-standalone:main

ARG GCC_VERSION=11.4.0
ARG MPICH_VERSION=4.2.1
ARG MPICH_VERSION=4.2.3
ARG SZIP_VERSION=2.1.1
ARG HDF5_VERSION=1.12.3
ARG NETCDFC_VERSION=4.9.2
ARG NETCDFCXX_VERSION=4.2
ARG NETCDFFORTRAN_VERSION=4.6.1
ARG PNETCDF_VERSION=1.12.1
ARG PNETCDF_VERSION=1.12.3

ENV GCC_VERSION=${GCC_VERSION}
ENV MPICH_VERSION=${MPICH_VERSION}
Expand Down Expand Up @@ -78,14 +78,14 @@ RUN mkdir -p /opt/spack-environment \
&& echo "") > /opt/spack-environment/spack.yaml

# TODO: do these intervene with each other?
# https://cache.spack.io/tag/v0.22.2/
RUN spack mirror add v0.22.2 https://binaries.spack.io/v0.22.2
# https://cache.spack.io/tag/v0.23.0/
RUN spack mirror add v0.23.0 https://binaries.spack.io/v0.23.0
RUN spack buildcache keys --install --trust
# https://cache.spack.io/tag/v0.22.1/?stack=e4s
RUN spack mirror add v0.22.2-e4s https://binaries.spack.io/v0.22.2/e4s
# https://cache.spack.io/tag/v0.23.0/?stack=e4s
RUN spack mirror add v0.23.0-e4s https://binaries.spack.io/v0.23.0/e4s
RUN spack buildcache keys --install --trust
# https://cache.spack.io/tag/v0.22.2/?stack=root#
RUN spack mirror add v0.22.2-root https://binaries.spack.io/v0.22.2/root
# https://cache.spack.io/tag/v0.23.0/?stack=root#
RUN spack mirror add v0.23.0-root https://binaries.spack.io/v0.23.0/root
RUN spack buildcache keys --install --trust

# TODO: add e4s inventory when they support ubuntu 22.04+
Expand Down

0 comments on commit ebb77f2

Please sign in to comment.