From c62ae7bedae862d86d61855416825d6fadc2c6ac Mon Sep 17 00:00:00 2001 From: David Thorpe Date: Mon, 3 Jun 2024 10:27:05 +0200 Subject: [PATCH] Updated workflows --- .github/workflows/container.yaml | 7 +++---- .github/workflows/merge.yaml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/container.yaml b/.github/workflows/container.yaml index 2a08c32..bb0147d 100644 --- 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 index 4abd0ad..cd2a4de 100644 --- 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