From e9e293aa85ca56f3a47bd1b4ff914c0b5aff5f30 Mon Sep 17 00:00:00 2001 From: Elia Migliore Date: Thu, 28 Nov 2024 14:03:50 +0100 Subject: [PATCH 1/3] fix: remove the label for the workflow --- .github/workflows/container.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 0ed6475e2..65b91429d 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -76,7 +76,5 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - build-args: | - KARAPACE_VERSION=${{ steps.ctx.outputs.version }} file: container/Dockerfile platforms: "linux/amd64,linux/arm64" From 96fc3d9d7c265e5b40c2c83c7612c1123c65b27b Mon Sep 17 00:00:00 2001 From: Elia Migliore Date: Thu, 28 Nov 2024 14:11:08 +0100 Subject: [PATCH 2/3] Revert "fix: remove the label for the workflow" This reverts commit 3343b6ef411562a624d2f2a4c6964f2ae23eb36d. --- .github/workflows/container.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 65b91429d..0ed6475e2 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -76,5 +76,7 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + build-args: | + KARAPACE_VERSION=${{ steps.ctx.outputs.version }} file: container/Dockerfile platforms: "linux/amd64,linux/arm64" From 71d486cda04b9c9fd5a65bfa3d86c98a5e012231 Mon Sep 17 00:00:00 2001 From: Elia Migliore Date: Thu, 28 Nov 2024 14:12:24 +0100 Subject: [PATCH 3/3] fix: remove the label for the workflow --- .github/workflows/container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 0ed6475e2..33ec5f308 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -33,7 +33,7 @@ jobs: run: | echo is_release=${{ contains(github.ref, 'refs/tags/') }} | tee -a $GITHUB_OUTPUT echo is_dev=${{ ! contains(github.ref, 'refs/tags/') }} | tee -a $GITHUB_OUTPUT - echo version=$(git describe --always --tags) | tee -a $GITHUB_OUTPUT + echo version=$(git describe --tags | cut -d '-' -f -2 | sed 's/-/.dev/g') # QEMU is used to set up VMs for building non-x86_64 images. - name: Set up QEMU