From b547b2a88d673b2814beb3f5d65decf7db9f3857 Mon Sep 17 00:00:00 2001
From: Jeremy Thurgood <jeremy@reachdigitalhealth.org>
Date: Thu, 23 Nov 2023 14:10:52 +0200
Subject: [PATCH 1/3] Add python 3.7 no-wheelhouse image and update other
 python versions

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b30fd62..3e2b719 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -79,7 +79,7 @@ jobs:
     strategy:
       matrix:
         dist: [buster, bullseye]
-        version: ["3.11.3", "3.10.11", "3.9.16", "3.8.16"]
+        version: ["3.11.6", "3.10.13", "3.9.18", "3.8.18", "3.7.17"]
         python: [python]
         include:
           - version: "2.7"

From 569ca77981f62497ecc51f082e2b3def88528a2e Mon Sep 17 00:00:00 2001
From: Jeremy Thurgood <jeremy@reachdigitalhealth.org>
Date: Thu, 23 Nov 2023 14:12:58 +0200
Subject: [PATCH 2/3] Remove obsolete wheelhouse-based images

---
 .github/workflows/build.yaml | 67 ------------------------------------
 1 file changed, 67 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3e2b719..2c9acd5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,73 +7,6 @@ on:
     branches: ["master"]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          # - version: "2.7.18"
-          #   dist: stretch
-          #   python: python
-          # - version: "3.6.14"
-          #   dist: stretch
-          #   python: python
-          # - version: "3.7.11"
-          #   dist: stretch
-          #   python: python
-          - version: "3.8.11"
-            dist: buster
-            python: python
-          - version: "3.9.6"
-            dist: buster
-            python: python
-          - version: "2.7"
-            version_suffix: "-7.3.5"
-            dist: buster
-            python: pypy
-          - version: "3.6"
-            version_suffix: "-7.3.3"
-            dist: buster
-            python: pypy
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: docker/setup-buildx-action@v2
-      - name: construct image metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            praekeltfoundation/${{matrix.python}}-base
-            ghcr.io/praekeltfoundation/${{matrix.python}}-base
-          tags: |
-            type=pep440,pattern={{version}},value=${{matrix.version}}
-            type=pep440,pattern={{major}}.{{minor}},value=${{matrix.version}}
-            type=pep440,pattern={{major}},value=${{matrix.version}}
-            type=raw,value=${{matrix.dist}}
-            type=pep440,pattern={{version}}-${{matrix.dist}},value=${{matrix.version}}
-            type=pep440,pattern={{major}}.{{minor}}-${{matrix.dist}},value=${{matrix.version}}
-            type=pep440,pattern={{major}}-${{matrix.dist}},value=${{matrix.version}}
-      - name: login to ghcr
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{github.actor}}
-          password: ${{secrets.GITHUB_TOKEN}}
-      - name: login to docker hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{secrets.DOCKER_USERNAME}}
-          password: ${{secrets.DOCKER_PASSWORD}}
-      - name: build and push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: ${{github.event_name != 'pull_request'}}
-          tags: ${{steps.meta.outputs.tags}}
-          build-args: |
-            FROM_IMAGE=${{matrix.python}}:${{matrix.version}}${{matrix.version_suffix}}-slim-${{matrix.dist}}
-
   build-no-wheelhouse:
     runs-on: ubuntu-latest
     strategy:

From c3ef69d2062e7abe539c477ea967c015728b8945 Mon Sep 17 00:00:00 2001
From: Jeremy Thurgood <jeremy@reachdigitalhealth.org>
Date: Thu, 23 Nov 2023 14:16:54 +0200
Subject: [PATCH 3/3] Remove buster variants, turn off fail-fast

---
 .github/workflows/build.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2c9acd5..665fdc1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -10,8 +10,9 @@ jobs:
   build-no-wheelhouse:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        dist: [buster, bullseye]
+        dist: [bullseye]
         version: ["3.11.6", "3.10.13", "3.9.18", "3.8.18", "3.7.17"]
         python: [python]
         include: