From fd11c8cf1cfdba45485dcf837b9dc55063418d6a Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Tue, 4 Feb 2025 08:42:46 +0200 Subject: [PATCH 1/4] Add the missing "v" in front of k3s version and refactor steps Fixes: https://github.com/kairos-io/kairos/issues/3167 Signed-off-by: Dimitris Karakasilis --- .github/workflows/reusable-docker-arm-build.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/reusable-docker-arm-build.yaml b/.github/workflows/reusable-docker-arm-build.yaml index 903d3ede2..2b4ef6c04 100644 --- a/.github/workflows/reusable-docker-arm-build.yaml +++ b/.github/workflows/reusable-docker-arm-build.yaml @@ -59,17 +59,16 @@ jobs: repository: quay.io/kairos/packages-arm64 packages: system/kairos-agent - name: Set Version + if: ${{ startsWith(github.ref, 'refs/tags/v') || github.event_name == 'pull_request' }} run: | echo "GIT_VERSION=$(git describe --always --tags --dirty)" >> $GITHUB_ENV - - name: Set Image name (master) + - name: Set Version if: ${{ github.ref == 'refs/heads/master' }} run: | - IMAGE_REF=$(SOFTWARE_VERSION=${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s 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' }} + echo "RELEASE=master" >> $GITHUB_ENV + - name: Set Image name run: | - IMAGE_REF=$(SOFTWARE_VERSION=${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s 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) + IMAGE_REF=$(SOFTWARE_VERSION=v${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release }}" MODEL=${{ inputs.model }} TARGETARCH=arm64 VARIANT=${{ inputs.variant }} REGISTRY_AND_ORG="${{ env.REGISTRY }}" RELEASE=${{ env.RELEASE }} kairos-agent versioneer container-artifact-name) echo "IMAGE_REF=${IMAGE_REF}" >> $GITHUB_ENV - name: Set up Docker Buildx if: ${{ inputs.worker != 'ARM64' }} @@ -107,7 +106,7 @@ jobs: FAMILY=${{ inputs.family }} BASE_IMAGE=${{ inputs.base_image }} RELEASE=${{ env.GIT_VERSION }} - SOFTWARE_VERSION=${{ inputs.k3s_version }} + SOFTWARE_VERSION=v${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver FRAMEWORK_VERSION=v2.15.12 @@ -156,7 +155,7 @@ jobs: FAMILY=${{ inputs.family }} BASE_IMAGE=${{ inputs.base_image }} RELEASE=${{ env.GIT_VERSION }} - SOFTWARE_VERSION=${{ inputs.k3s_version }} + SOFTWARE_VERSION=v${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver FRAMEWORK_VERSION=v2.15.12 From 105c80bede95232aa6972c7c21714019e684630e Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Tue, 4 Feb 2025 09:01:59 +0200 Subject: [PATCH 2/4] Only add prefix 'v' if there ks a k3s_version Signed-off-by: Dimitris Karakasilis --- .github/workflows/reusable-docker-arm-build.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable-docker-arm-build.yaml b/.github/workflows/reusable-docker-arm-build.yaml index 2b4ef6c04..8d9d668a4 100644 --- a/.github/workflows/reusable-docker-arm-build.yaml +++ b/.github/workflows/reusable-docker-arm-build.yaml @@ -61,14 +61,19 @@ jobs: - name: Set Version if: ${{ startsWith(github.ref, 'refs/tags/v') || github.event_name == 'pull_request' }} run: | - echo "GIT_VERSION=$(git describe --always --tags --dirty)" >> $GITHUB_ENV + echo "RELEASE=$(git describe --always --tags --dirty)" >> $GITHUB_ENV - name: Set Version if: ${{ github.ref == 'refs/heads/master' }} run: | echo "RELEASE=master" >> $GITHUB_ENV - name: Set Image name run: | - IMAGE_REF=$(SOFTWARE_VERSION=v${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release }}" MODEL=${{ inputs.model }} TARGETARCH=arm64 VARIANT=${{ inputs.variant }} REGISTRY_AND_ORG="${{ env.REGISTRY }}" RELEASE=${{ env.RELEASE }} kairos-agent versioneer container-artifact-name) + SOFTWARE_VERSION="${{ inputs.k3s_version }}" + if [ -n "$SOFTWARE_VERSION" ]; then + SOFTWARE_VERSION="v$SOFTWARE_VERSION" + fi + + IMAGE_REF=$(SOFTWARE_VERSION=${SOFTWARE_VERSION} SOFTWARE_VERSION_PREFIX=k3s FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release }}" MODEL=${{ inputs.model }} TARGETARCH=arm64 VARIANT=${{ inputs.variant }} REGISTRY_AND_ORG="${{ env.REGISTRY }}" RELEASE=${{ env.RELEASE }} kairos-agent versioneer container-artifact-name) echo "IMAGE_REF=${IMAGE_REF}" >> $GITHUB_ENV - name: Set up Docker Buildx if: ${{ inputs.worker != 'ARM64' }} @@ -106,7 +111,7 @@ jobs: FAMILY=${{ inputs.family }} BASE_IMAGE=${{ inputs.base_image }} RELEASE=${{ env.GIT_VERSION }} - SOFTWARE_VERSION=v${{ inputs.k3s_version }} + SOFTWARE_VERSION: ${{ inputs.k3s_version && 'v' || '' }}${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver FRAMEWORK_VERSION=v2.15.12 @@ -155,7 +160,7 @@ jobs: FAMILY=${{ inputs.family }} BASE_IMAGE=${{ inputs.base_image }} RELEASE=${{ env.GIT_VERSION }} - SOFTWARE_VERSION=v${{ inputs.k3s_version }} + SOFTWARE_VERSION: ${{ inputs.k3s_version && 'v' || '' }}${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver FRAMEWORK_VERSION=v2.15.12 From 7bdf70512835a876bc55d78579488465502d61c1 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Tue, 4 Feb 2025 09:28:40 +0200 Subject: [PATCH 3/4] Use the same RELEASE value everywhere Signed-off-by: Dimitris Karakasilis --- .../workflows/reusable-docker-arm-build.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/reusable-docker-arm-build.yaml b/.github/workflows/reusable-docker-arm-build.yaml index 8d9d668a4..8086f18d6 100644 --- a/.github/workflows/reusable-docker-arm-build.yaml +++ b/.github/workflows/reusable-docker-arm-build.yaml @@ -59,13 +59,14 @@ jobs: repository: quay.io/kairos/packages-arm64 packages: system/kairos-agent - name: Set Version - if: ${{ startsWith(github.ref, 'refs/tags/v') || github.event_name == 'pull_request' }} run: | - echo "RELEASE=$(git describe --always --tags --dirty)" >> $GITHUB_ENV - - name: Set Version - if: ${{ github.ref == 'refs/heads/master' }} - run: | - echo "RELEASE=master" >> $GITHUB_ENV + echo "GIT_VERSION=$(git describe --always --tags --dirty)" >> $GITHUB_ENV + if [ "$GITHUB_REF" == "refs/heads/master" ]; then + echo "RELEASE=master" >> $GITHUB_ENV + else + echo "RELEASE=$GIT_VERSION" >> $GITHUB_ENV + fi + - name: Set Image name run: | SOFTWARE_VERSION="${{ inputs.k3s_version }}" @@ -110,7 +111,7 @@ jobs: FLAVOR_RELEASE=${{ inputs.flavor_release }} FAMILY=${{ inputs.family }} BASE_IMAGE=${{ inputs.base_image }} - RELEASE=${{ env.GIT_VERSION }} + RELEASE=${{ env.RELEASE }} SOFTWARE_VERSION: ${{ inputs.k3s_version && 'v' || '' }}${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver @@ -159,7 +160,7 @@ jobs: FLAVOR_RELEASE=${{ inputs.flavor_release }} FAMILY=${{ inputs.family }} BASE_IMAGE=${{ inputs.base_image }} - RELEASE=${{ env.GIT_VERSION }} + RELEASE=${{ env.RELEASE }} SOFTWARE_VERSION: ${{ inputs.k3s_version && 'v' || '' }}${{ inputs.k3s_version }} SOFTWARE_VERSION_PREFIX=k3s # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver From 8900f15628b411a546278b8bee28eb3bf89f48e0 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Tue, 4 Feb 2025 09:36:17 +0200 Subject: [PATCH 4/4] Set github env variables correctly Signed-off-by: Dimitris Karakasilis --- .github/workflows/reusable-docker-arm-build.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reusable-docker-arm-build.yaml b/.github/workflows/reusable-docker-arm-build.yaml index 8086f18d6..181e08063 100644 --- a/.github/workflows/reusable-docker-arm-build.yaml +++ b/.github/workflows/reusable-docker-arm-build.yaml @@ -60,12 +60,10 @@ jobs: packages: system/kairos-agent - name: Set Version run: | - echo "GIT_VERSION=$(git describe --always --tags --dirty)" >> $GITHUB_ENV - if [ "$GITHUB_REF" == "refs/heads/master" ]; then - echo "RELEASE=master" >> $GITHUB_ENV - else - echo "RELEASE=$GIT_VERSION" >> $GITHUB_ENV - fi + GIT_VERSION=$(git describe --always --tags --dirty) + RELEASE=$([ "$GITHUB_REF" == "refs/heads/master" ] && echo "master" || echo "$GIT_VERSION") + echo "GIT_VERSION=$GIT_VERSION" >> $GITHUB_ENV + echo "RELEASE=$RELEASE" >> $GITHUB_ENV - name: Set Image name run: |