Skip to content

Commit

Permalink
test dockerfile list too
Browse files Browse the repository at this point in the history
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
  • Loading branch information
vsoch committed Feb 17, 2022
1 parent 70ecc0c commit fe3b0bc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/build-matrices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ jobs:
fi
done
echo ${parsed}
# No parsed results will build ALL
if [[ "${parsed}" == "" ]]; then
parsed="/does/not/exist/pathy"
fi
echo "::set-output name=parsed_files::${parsed}"
- name: Generate Build Matrix
Expand Down Expand Up @@ -127,7 +132,7 @@ jobs:
uses: actions/checkout@v2

- name: GHCR Login
if: (github.event_name != 'schedule')
if: (github.event_name != 'pull_request')
uses: docker/login-action@v1
with:
registry: ghcr.io
Expand Down Expand Up @@ -175,7 +180,7 @@ jobs:
echo ::set-output name=dockerfile_dir::${basedir}
- name: Deploy Container
if: (github.event_name != 'schedule')
if: (github.event_name != 'pull_request')
env:
container: ${{ matrix.result.container_name }}
run: |
Expand All @@ -186,7 +191,7 @@ jobs:
- name: Run Librarian
id: runner
uses: rse-ops/librarian/docker-images@main
if: (github.event_name != 'schedule')
if: (github.event_name != 'pull_request')
with:
container: ${{ steps.builder.outputs.uri }}
dockerfile: ${{ steps.builder.outputs.dockerfile_dir }}
Expand Down
1 change: 1 addition & 0 deletions ubuntu/20.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:20.04@sha256:669e010b58baf5beb2836b253c1fd5768333f0d1dbcb834f7c07a4dc93f474be

LABEL maintainer="Chris White <white238@llnl.gov>,@vsoch"

ARG uptodate_github_commit_spack__spack__develop=dcdf5022ad37daee7809245cfd68eed72fde6171
ENV spack_commit=${uptodate_github_commit_spack__spack__develop}
ENV DEBIAN_FRONTEND=noninteractive
Expand Down

0 comments on commit fe3b0bc

Please sign in to comment.