From 2e39b6e5689e8c6a89b99adbeb15112f4f97caf3 Mon Sep 17 00:00:00 2001
From: Scott Aubrey <scott@aubrey.org.uk>
Date: Thu, 14 Nov 2024 06:26:07 +0000
Subject: [PATCH] complete build phase with critical css building and pushing

---
 .github/workflows/ci.yaml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0f3a9c701..b187f5da9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -42,7 +42,7 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
     needs: [generate-date, tests]
-    if: github.ref == 'refs/heads/master'
+    # if: github.ref == 'refs/heads/master'
     env:
       CONTAINER_REPO: ghcr.io/elifesciences/journal
       CONTAINER_TAG: ${{ github.head_ref || github.ref_name }}-${{ github.sha }}-${{ needs.generate-date.outputs.date }}
@@ -56,7 +56,17 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build container image
         run: |
-          docker compose -f 'docker-compose.yml' -f 'docker-compose.ci.yml' build
+          # Build all images
+          docker compose -f docker-compose.yml -f docker-compose.ci.yml build
+
+          # Build critical CSS
+          docker compose -f docker-compose.yml -f docker-compose.ci.yml run --name=journal_critical_css critical_css
+          docker cp journal_critical_css:build/critical-css/. build/critical-css/
+
+          # Rebuild app now we have new CSS
+          docker-compose -f docker-compose.yml -f docker-compose.ci.yml build app
+
+          # Retag and push
           docker image tag elifesciences/journal:develop ${CONTAINER_REPO}:${CONTAINER_TAG}
       - name: Push container image
         run: docker push ${CONTAINER_REPO}:${CONTAINER_TAG}