Skip to content

Commit

Permalink
Correct cache action hash
Browse files Browse the repository at this point in the history
  • Loading branch information
lukemartinlogan committed Feb 8, 2024
1 parent 0b74b9a commit 3e75a48
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_push_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
id: docker-deps-cache
with:
path: ci/deps/deps.Dockerfile
key: docker-${{ hashFiles('ci/deps/deps.Dockerfile') }}
key: docker-${{ hashFiles('docker/deps.Dockerfile') }}
- name: Checkout
uses: actions/checkout@v3
- name: Login to Docker Hub
Expand Down
7 changes: 4 additions & 3 deletions docker/deps.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# NOTE(llogan): This dockerfile assumes that
# hermes github is mounted on /hermes
# hermes github is the current working directory

# Install ubuntu 22.04
FROM ubuntu:22.04
Expand Down Expand Up @@ -38,9 +38,10 @@ ENV SPACK_DIR="${HOME}/spack"
ENV SPACK_VERSION="v0.20.2"
ENV HERMES_DEPS_DIR="${HOME}/hermes_deps"
ENV HERMES_DIR="${HOME}/hermes"
COPY ci/module_load.sh module_load.sh

# Install Spack
RUN . /hermes/ci/module_load.sh && \
RUN . /module_load.sh && \
git clone -b ${SPACK_VERSION} https://github.com/spack/spack ${SPACK_DIR} && \
. "${SPACK_DIR}/share/spack/setup-env.sh" && \
git clone -b dev https://github.com/lukemartinlogan/hermes.git ${HERMES_DEPS_DIR} && \
Expand All @@ -50,7 +51,7 @@ RUN . /hermes/ci/module_load.sh && \
spack external find

# Install hermes_shm
RUN . /hermes/ci/module_load.sh && \
RUN . /module_load.sh && \
. "${SPACK_DIR}/share/spack/setup-env.sh" && \
spack external find && \
spack install hermes_shm@master+vfd+mpiio^[email protected]
Expand Down

0 comments on commit 3e75a48

Please sign in to comment.