Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the missing "v" in front of k3s version #3168

Merged
merged 4 commits into from
Feb 4, 2025
Merged

Add the missing "v" in front of k3s version #3168

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd11c8c
Add the missing "v" in front of k3s version
jimmykarily Feb 4, 2025
105c80b
Only add prefix 'v' if there ks a k3s_version
jimmykarily Feb 4, 2025
7bdf705
Use the same RELEASE value everywhere
jimmykarily Feb 4, 2025
8900f15
Set github env variables correctly
jimmykarily Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions .github/workflows/reusable-docker-arm-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,19 @@ jobs:
packages: system/kairos-agent
- name: Set Version
run: |
echo "GIT_VERSION=$(git describe --always --tags --dirty)" >> $GITHUB_ENV
- name: Set Image name (master)
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' }}
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: |
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)
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)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RELEASE=${{ env.RELEASE }} is redundant (env is already set) but better put it there to make it clear what value is being used?

echo "IMAGE_REF=${IMAGE_REF}" >> $GITHUB_ENV
- name: Set up Docker Buildx
if: ${{ inputs.worker != 'ARM64' }}
Expand Down Expand Up @@ -106,8 +109,8 @@ jobs:
FLAVOR_RELEASE=${{ inputs.flavor_release }}
FAMILY=${{ inputs.family }}
BASE_IMAGE=${{ inputs.base_image }}
RELEASE=${{ env.GIT_VERSION }}
SOFTWARE_VERSION=${{ inputs.k3s_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
FRAMEWORK_VERSION=v2.15.12
Expand Down Expand Up @@ -155,8 +158,8 @@ jobs:
FLAVOR_RELEASE=${{ inputs.flavor_release }}
FAMILY=${{ inputs.family }}
BASE_IMAGE=${{ inputs.base_image }}
RELEASE=${{ env.GIT_VERSION }}
SOFTWARE_VERSION=${{ inputs.k3s_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
FRAMEWORK_VERSION=v2.15.12
Expand Down
Loading