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.

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

Fix arm64 artifact naming missing k3s version #3144

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Changes from all commits
Commits
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
Fix arm64 artifact naming missing k3s version
Signed-off-by: Dimitris Karakasilis <[email protected]>
jimmykarily committed Jan 27, 2025

Verified

This commit was signed with the committer’s verified signature.
jimmykarily Dimitris Karakasilis
commit 74bad10f007e9306dbf5a26151a06c63ac540388
4 changes: 2 additions & 2 deletions .github/workflows/reusable-docker-arm-build.yaml
Original file line number Diff line number Diff line change
@@ -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' }}
Loading