Skip to content

Commit

Permalink
TEMP changes for CI
Browse files Browse the repository at this point in the history
  • Loading branch information
ddundo committed Dec 11, 2024
1 parent bbb6079 commit 6da57f5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,12 @@ jobs:
name: "Build Docker containers"
# Only run on master, but always generate firedrake-env image,
# even if build fails (see docker.yml)
if: ${{ (github.ref == 'refs/heads/master') && always() }}
needs: [build, docker_tag]
# if: ${{ (github.ref == 'refs/heads/master') && always() }}
# needs: [build, docker_tag]
if: ${{ always() }}
uses: ./.github/workflows/docker.yml
with:
tag: ${{ needs.docker_tag.outputs.tag }}
# tag: ${{ needs.docker_tag.outputs.tag }}
tag: testing
status: ${{ needs.build.result }}
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
docker_vanilla:
needs: docker_env
# Only run if "Build Firedrake" succeeds
if: ${{ inputs.status == 'success' }}
# if: ${{ inputs.status == 'success' }}
uses: ./.github/workflows/docker_reuse.yml
with:
target: firedrake-vanilla
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
docker_complex:
needs: docker_env
# Only run if "Build Firedrake" succeeds
if: ${{ inputs.status == 'success' }}
# if: ${{ inputs.status == 'success' }}
uses: ./.github/workflows/docker_reuse.yml
with:
target: firedrake-complex
Expand Down

0 comments on commit 6da57f5

Please sign in to comment.