From 059d695ad998e80974ae40498634df34777b3446 Mon Sep 17 00:00:00 2001
From: Dustin Spicuzza <dustin@virtualroadside.com>
Date: Tue, 17 Oct 2023 03:23:37 -0400
Subject: [PATCH] Update github actions to build python images in parallel

- They take about 10 minutes each to build
---
 .github/workflows/main.yml | 75 ++++++++++++++++++++++++++++++++++++++
 Makefile                   |  7 ++++
 cross-ubuntu-py/py.mk      |  5 ---
 3 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fb843c4..2a0b4a7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,6 +2,10 @@ name: CI
 
 on: [push, pull_request, workflow_dispatch]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build
@@ -14,3 +18,74 @@ jobs:
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
           make push
         if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }} 
+
+  build-minimal:
+    name: Build Minimal
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: make update
+      - run: make build/minimal-cross
+      - run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          make push/minimal-cross
+        if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }}
+
+      - run: make save/minimal-images
+      - uses: actions/upload-artifact@v3
+        with:
+          name: roborio
+          path: roborio.tar.gz
+          retention-days: 1
+      - uses: actions/upload-artifact@v3
+        with:
+          name: raspbian
+          path: raspbian.tar.gz
+          retention-days: 1
+      - uses: actions/upload-artifact@v3
+        with:
+          name: aarch64
+          path: aarch64.tar.gz
+          retention-days: 1
+
+  build-python:
+    name: Build Python Images
+    needs: [build-minimal]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        type:
+        - raspbian
+        - aarch64
+        pyversion:
+        - py38
+        - py39
+        - py310
+        - py311
+        - py312
+        include:
+        - type: roborio
+          pyversion: py312
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Download image
+      uses: actions/download-artifact@v3
+      with:
+        name: ${{ matrix.type }}
+        path: img
+
+    - name: Load image
+      run: |
+        gunzip -c img/${{ matrix.type }}.tar.gz | docker load
+        rm img/${{ matrix.type }}.tar.gz
+
+    - name: Build image
+      run: make build/cross-${{ matrix.type }}-${{ matrix.pyversion }}
+
+    - name: Upload image
+      run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          make push/cross-${{ matrix.type }}-${{ matrix.pyversion }}
+      if: ${{ github.repository_owner == 'wpilibsuite' && github.ref == 'refs/heads/main' }}
diff --git a/Makefile b/Makefile
index 7aa4c8b..14a95fb 100644
--- a/Makefile
+++ b/Makefile
@@ -67,4 +67,11 @@ push/minimal-cross: push/minimal-base
 push/opensdk:
 	docker push ${DOCKER_USER}/opensdk-ubuntu:${OPENSDK_UBUNTU}
 
+
+.PHONY: save/minimal-cross
+save/minimal-cross:
+	docker save ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2024-${UBUNTU} | gzip > roborio.tar.gz
+	docker save ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > raspbian.tar.gz
+	docker save ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > aarch64.tar.gz
+
 include cross-ubuntu-py/py.mk
diff --git a/cross-ubuntu-py/py.mk b/cross-ubuntu-py/py.mk
index 2d87650..3815a5b 100644
--- a/cross-ubuntu-py/py.mk
+++ b/cross-ubuntu-py/py.mk
@@ -17,11 +17,6 @@ VERSION_ROBORIO=2024
 TARGET_HOST_ROBORIO=arm-frc2024-linux-gnueabi
 AC_TARGET_HOST_ROBORIO=armv7l-frc2024-linux-gnueabi
 
-.PHONY: save-minimal-images
-save-minimal-images:
-	docker save ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2024-${UBUNTU} | gzip > roborio.tar.gz
-	docker save ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > raspbian.tar.gz
-	docker save ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > aarch64.tar.gz
 
 .PHONY: build/cross-python
 build/cross-python: build/cross-raspbian-py38 build/cross-aarch64-py38 build/cross-raspbian-py39 build/cross-aarch64-py39 build/cross-raspbian-py310 build/cross-aarch64-py310 build/cross-raspbian-py311 build/cross-aarch64-py311 build/cross-roborio-py312 build/cross-raspbian-py312 build/cross-aarch64-py312