Encode buildx into cibuild

azavea · Feb 25, 2024 · 3ad5875 · 3ad5875
1 parent f6d2673
commit 3ad5875
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -32,20 +32,8 @@ jobs:
       - name: Set up environment
         run: ./scripts/bootstrap
 
-      - run: ./scripts/fetch-data
+      - run: ./scripts/cibuild
 
-      - uses: docker/build-push-action@v5
-        with:
-          context: src/django
-          push: false
-          tags: iow:${{ github.sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - run: ./scripts/update
-
-      - run: ./scripts/test
-
       - run: ./scripts/cipublish
         if: |
           github.ref == 'refs/heads/develop' ||

diff --git a/scripts/cibuild b/scripts/cibuild
@@ -27,10 +27,12 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
         ./scripts/update
 
         # Build tagged container images
-        GIT_COMMIT="${GIT_COMMIT}" docker-compose \
+        GIT_COMMIT="${GIT_COMMIT}" docker buildx bake \
             -f docker-compose.yml \
             -f docker-compose.ci.yml \
-            build django
+            --set django.cache-from="type=gha" \
+            --set django.cache-to="type=gha,mode=max" \
+            django
 
         # Test using tagged container images
         GIT_COMMIT="${GIT_COMMIT}" \