Merge pull request #62 from mutablelogic/v4

Updated workflows
mutablelogic · Jun 3, 2024 · fe7801c · fe7801c
2 parents 1a3e86f + c62ae7b
commit fe7801c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/container.yaml b/.github/workflows/container.yaml
@@ -79,12 +79,11 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Create Manifest
+      - name: Create
         run: |
           docker manifest create ${{ needs.var.outputs.image }}:${{ matrix.tag }} \
             --amend ${{ needs.var.outputs.image }}-linux-amd64:${{ needs.var.outputs.tag }} \
             --amend ${{ needs.var.outputs.image }}-linux-arm64:${{ needs.var.outputs.tag }}
-          docker image ls
       - name: Annotate
         run: |
           docker manifest annotate --arch arm64 --os linux \
@@ -93,7 +92,7 @@ jobs:
           docker manifest annotate --arch amd64 --os linux \
             ${{ needs.var.outputs.image }}:${{ matrix.tag  }} \
             ${{ needs.var.outputs.image }}-linux-amd64:${{ needs.var.outputs.tag }}
+          docker manifest push ${{ needs.var.outputs.image }}:${{ matrix.tag }}
       - name: Push
         run: |
-          docker manifest push ${{ needs.var.outputs.image }}:${{ matrix.tag }}          
-
+          docker manifest push ${{ needs.var.outputs.image }}:${{ matrix.tag }}
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.22' ]  
+        go-version: [ '1.21', '1.22' ]  
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4