From 74bad10f007e9306dbf5a26151a06c63ac540388 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Mon, 27 Jan 2025 10:21:12 +0200 Subject: [PATCH] Fix arm64 artifact naming missing k3s version Signed-off-by: Dimitris Karakasilis --- .github/workflows/reusable-docker-arm-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-docker-arm-build.yaml b/.github/workflows/reusable-docker-arm-build.yaml index 7e9889a3c..68e319f96 100644 --- a/.github/workflows/reusable-docker-arm-build.yaml +++ b/.github/workflows/reusable-docker-arm-build.yaml @@ -64,12 +64,12 @@ jobs: - name: Set Image name (master) if: ${{ github.ref == 'refs/heads/master' }} run: | - IMAGE_REF=$(FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release }}" MODEL=${{ inputs.model }} TARGETARCH=arm64 VARIANT=${{ inputs.variant }} REGISTRY_AND_ORG="${{ env.REGISTRY }}" RELEASE=master kairos-agent versioneer container-artifact-name) + SOFTWARE_VERSION=${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s IMAGE_REF=$(FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release }}" MODEL=${{ inputs.model }} TARGETARCH=arm64 VARIANT=${{ inputs.variant }} REGISTRY_AND_ORG="${{ env.REGISTRY }}" RELEASE=master kairos-agent versioneer container-artifact-name) echo "IMAGE_REF=${IMAGE_REF}" >> $GITHUB_ENV - name: Set Image name (release/PR) if: ${{ startsWith(github.ref, 'refs/tags/v') || github.event_name == 'pull_request' }} run: | - IMAGE_REF=$(FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release }}" MODEL=${{ inputs.model }} TARGETARCH=arm64 VARIANT=${{ inputs.variant }} REGISTRY_AND_ORG="${{ env.REGISTRY }}" RELEASE=${{ env.GIT_VERSION }} kairos-agent versioneer container-artifact-name) + SOFTWARE_VERSION=${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s IMAGE_REF=$(FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release }}" MODEL=${{ inputs.model }} TARGETARCH=arm64 VARIANT=${{ inputs.variant }} REGISTRY_AND_ORG="${{ env.REGISTRY }}" RELEASE=${{ env.GIT_VERSION }} kairos-agent versioneer container-artifact-name) echo "IMAGE_REF=${IMAGE_REF}" >> $GITHUB_ENV - name: Set up Docker Buildx if: ${{ inputs.worker != 'ARM64' }}