Remove arm/v6 and start building multiple arch's

Author: justdan6

.github/workflows/ci-matrix.yml

@@ -1,24 +1,24 @@
 name: ci-matrix
 
 on:
-  push:
-    branches:
-      - "master"
-    tags:
-      - "v*.*.*"
+  workflow_run:
+    workflows: [Docker Image CI]
+    branches: [master]
+    types:
+    - completed
 
 env:
   REGISTRY_IMAGE: justdanz/nginx-http3-quictls
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     strategy:
       fail-fast: false
       matrix:
         platform:
           - linux/amd64
-          - linux/arm/v6
           - linux/arm/v7
           - linux/arm64
           - linux/ppc64le
@@ -39,12 +39,12 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-    #   -
-    #     name: Login to Docker Hub
-    #     uses: docker/login-action@v2
-    #     with:
-    #       username: ${{ secrets.DOCKERHUB_USERNAME }}
-    #       password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push by digest
         id: build
@@ -69,39 +69,40 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
-#   merge:
-#     runs-on: ubuntu-latest
-#     needs:
-#       - build
-#     steps:
-#       -
-#         name: Download digests
-#         uses: actions/download-artifact@v3
-#         with:
-#           name: digests
-#           path: /tmp/digests
-#       -
-#         name: Set up Docker Buildx
-#         uses: docker/setup-buildx-action@v2
-#       -
-#         name: Docker meta
-#         id: meta
-#         uses: docker/metadata-action@v4
-#         with:
-#           images: ${{ env.REGISTRY_IMAGE }}
-#       -
-#         name: Login to Docker Hub
-#         uses: docker/login-action@v2
-#         with:
-#           username: ${{ secrets.DOCKERHUB_USERNAME }}
-#           password: ${{ secrets.DOCKERHUB_TOKEN }}
-#       -
-#         name: Create manifest list and push
-#         working-directory: /tmp/digests
-#         run: |
-#           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-#             $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-#       -
-#         name: Inspect image
-#         run: |
-#           docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+  merge:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    needs:
+      - build
+    steps:
+      -
+        name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+      -
+        name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}

.github/workflows/dockerimage.yml

@@ -1,8 +1,11 @@
 name: Docker Image CI
 
 on:
+  
   push:
     branches: [ master ]
+    tags:
+      - "v*.*.*"
   pull_request:
 
 jobs: