From bbb607980647cb7c2714a8f1cda2686dd126238e Mon Sep 17 00:00:00 2001
From: Davor Dundovic <33790330+ddundo@users.noreply.github.com>
Date: Wed, 11 Dec 2024 09:55:44 +0100
Subject: [PATCH 1/2] Remove unnecessary files inside the build layer

---
 docker/Dockerfile.env | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile.env b/docker/Dockerfile.env
index ac15aa7e2f..d40a613f85 100644
--- a/docker/Dockerfile.env
+++ b/docker/Dockerfile.env
@@ -67,9 +67,14 @@ RUN bash -c 'cd petsc; \
         --download-suitesparse \
         --download-superlu_dist \
         PETSC_ARCH=packages; \
-        mv packages/include/petscconf.h packages/include/old_petscconf.nope;'
+        mv packages/include/petscconf.h packages/include/old_petscconf.nope; \
+        rm -rf /home/firedrake/petsc/**/externalpackages; \
+        rm -rf /home/firedrake/petsc/src/docs; \
+        rm -f /home/firedrake/petsc/src/**/tutorials/output/*; \
+        rm -f /home/firedrake/petsc/src/**/tests/output/*'
 # Don't run make here, we only want MPICH and HWLOC
 # It is also necessary to move `petscconf.h` so packages isn't treated like a working PETSc
+# Cleaned up unnecessary files
 
 # Build default Firedrake PETSc
 RUN bash -c 'export PACKAGES=/home/firedrake/petsc/packages; \
@@ -149,12 +154,6 @@ RUN bash -c 'export PETSC_DIR=/home/firedrake/petsc; \
     ./configure; \
     make SLEPC_DIR=/home/firedrake/slepc PETSC_DIR=/home/firedrake/petsc PETSC_ARCH=complex;'
 
-# Clean up unnecessary files
-RUN rm -rf /home/firedrake/petsc/**/externalpackages \
-    && rm -rf /home/firedrake/petsc/src/docs \
-    && rm -f /home/firedrake/petsc/src/**/tutorials/output/* \
-    && rm -f /home/firedrake/petsc/src/**/tests/output/*
-
 # Set some useful environment variables
 ENV PETSC_DIR /home/firedrake/petsc
 ENV SLEPC_DIR /home/firedrake/slepc

From 6da57f596c54b2523234c40a66c38bd290ca4a4d Mon Sep 17 00:00:00 2001
From: Davor Dundovic <33790330+ddundo@users.noreply.github.com>
Date: Wed, 11 Dec 2024 12:50:52 +0000
Subject: [PATCH 2/2] TEMP changes for CI

---
 .github/workflows/build.yml  | 8 +++++---
 .github/workflows/docker.yml | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

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