Merge pull request #18 from berquist/simplify-gha

Only use a single file for GitHub Actions workflow

.github/workflows/py310.yaml → .github/workflows/build_and_push.yaml

@@ -1,4 +1,5 @@
-name: py310img
+---
+name: build and push
 
 on:
   push:
@@ -12,7 +13,15 @@ on:
 
 jobs:
   docker:
+    name: build and push ${{ matrix.pyver }}
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        pyver:
+          - py37
+          - py38
+          - py39
+          - py310
     steps:
       -
         name: Checkout
@@ -27,9 +36,9 @@ jobs:
           flavor: |
             latest=true
           tags: |
-            type=schedule,pattern={{date 'YYYYMMDD'}},prefix=py310-
-            type=sha,prefix=py310-
-            type=edge,prefix=py310-
+            type=schedule,pattern={{date 'YYYYMMDD'}},prefix=${{ matrix.pyver }}-
+            type=sha,prefix=${{ matrix.pyver }}-
+            type=edge,prefix=${{ matrix.pyver }}-
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -38,9 +47,9 @@ jobs:
         uses: docker/setup-buildx-action@v2
       -
         name: Build and export to Docker
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
-          context: py310
+          context: ${{ matrix.pyver }}
           push: false
           load: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -50,10 +59,11 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+        when: ${{ github.event_name != 'pull_request'}}
       -
         name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
-          context: py310
+          context: ${{ matrix.pyver }}
           push: ${{ github.event_name != 'pull_request'}}
           tags: ${{ steps.meta.outputs.tags }}

Justfile

@@ -14,4 +14,4 @@ shell:
     docker run -it shivupa/cclib-ci:{{ tag }} bash
 
 act:
-    act -W ./.github/workflows/{{ tag }}.yaml -P ubuntu-latest=catthehacker/ubuntu:act-latest
+    act -W ./.github/workflows/build_and_push.yaml -P ubuntu-latest=catthehacker/ubuntu:act-latest