Skip to content

Commit

Permalink
fix: fix tag
Browse files Browse the repository at this point in the history
  • Loading branch information
m2Giles committed Jun 30, 2024
1 parent 0ed60ac commit b3c9a1e
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ jobs:
attempt_delay: 15000
command: |
kernel_release=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:fsync-40 | jq -r '.Labels["ostree.linux"] | split(".fc")[0]')
kernel_major_minor_patch=$(echo "$kernel_release" | cut -d '.' -f 1)
major=$(echo "$kernel_release" | cut -d '.' -f 1)
minor=$(echo "$kernel_release" | cut -d '.' -f 2)
patch=$(echo "$kernel_release" | cut -d '.' -f 3)
kernel_major_minor_patch="${major}.${minor}.${patch}"
ver=$(skopeo inspect docker://quay.io/fedora-ostree-desktops/base:${{ matrix.fedora_version }} | jq -r '.Labels["org.opencontainers.image.version"]')
if [ -z "$ver" ] || [ "null" = "$ver" ]; then
echo "inspected image version must not be empty or null"
Expand All @@ -63,7 +66,7 @@ jobs:
id: generate_tags
shell: bash
run: |
tag=${{ env.kernel_major_minor_patch }}-fc${{ matrix.fedora_version }}
tag="${{ env.kernel_major_minor_patch }}.fsync.fc${{ matrix.fedora_version }}".x86_64
COMMIT_TAGS=()
COMMIT_TAGS+=("pr-${{ github.event_number }}-${tag}")
COMMIT_TAGS+=("${GITHUB_SHA::7}-${tag}")
Expand Down Expand Up @@ -105,7 +108,7 @@ jobs:
org.opencontainers.image.title=${{ env.IMAGE_NAME }}
org.opencontainers.image.description=A caching layer for sentry/kernel-fsync fsync kernel's
org.opencontainers.image.version=${{ env.version }}
ostree.linux=${{ env.kernel_major_minor_patch }}.fc${{ matrix.fedora_version }}.x86_64
ostree.linux="${{ env.kernel_major_minor_patch }}.fc${{ matrix.fedora_version }}.x86_64"
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ github.repository }}/main/README.md
io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/1728152?s=200&v=4
Expand Down

0 comments on commit b3c9a1e

Please sign in to comment.