diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 909db6990a..7bc4693d86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6e6bbcdb28..e5c0a07b7a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -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 @@ -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