Skip to content

fix(ci): use kernel version in tag to fix builds #349

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

Merged
bsherman merged 2 commits into from
Feb 12, 2026
Merged

fix(ci): use kernel version in tag to fix builds #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64aec14
fix(ci): use kernel version in tag to fix builds
bsherman Feb 12, 2026
3018ff1
fix bad copy pasta
bsherman Feb 12, 2026
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
9 changes: 5 additions & 4 deletions .github/workflows/reusable-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ jobs:
# pull the base image used for FROM in containerfile so
# we can retry on that unfortunately common failure case
podman pull quay.io/fedora/fedora-coreos:${{ env.IMAGE_VERSION }}
podman pull ${{ env.IMAGE_REGISTRY }}/akmods-zfs:${{ env.KERNEL_FLAVOR }}-${{ env.FEDORA_VERSION }}
podman pull ${{ env.IMAGE_REGISTRY }}/akmods-zfs:${{ env.KERNEL_FLAVOR }}-${{ env.FEDORA_VERSION }}-${{ env.KERNEL_VERSION }}
if [ -n "${{ matrix.nvidia_tag }}" ]; then
podman pull ${{ env.IMAGE_REGISTRY }}/akmods${{ matrix.nvidia_tag }}:${{ env.KERNEL_FLAVOR }}-${{ env.FEDORA_VERSION }}
podman pull ${{ env.IMAGE_REGISTRY }}/akmods${{ matrix.nvidia_tag }}:${{ env.KERNEL_FLAVOR }}-${{ env.FEDORA_VERSION }}-${{ env.KERNEL_VERSION }}
fi

- name: Verify versions (image, kernel, zfs)
Expand All @@ -187,7 +187,7 @@ jobs:
echo "env.KERNEL_VERSION must not be empty or null" >&2
exit 1
fi
podman inspect ${{ env.IMAGE_REGISTRY }}/akmods-zfs:${{ env.KERNEL_FLAVOR }}-${{ env.FEDORA_VERSION }} > inspect.json
podman inspect ${{ env.IMAGE_REGISTRY }}/akmods-zfs:${{ env.KERNEL_FLAVOR }}-${{ env.FEDORA_VERSION }}-${{ env.KERNEL_VERSION }} > inspect.json
kernel=$(jq -r '.[]["Config"]["Labels"]["ostree.linux"]' inspect.json)
if [[ "${{ env.KERNEL_VERSION }}" != "$kernel"* ]]; then
echo "pulled akmods-zfs image kernel ($kernel) does not match expected kernel (${{ env.KERNEL_VERSION }})" >&2
Expand All @@ -199,7 +199,7 @@ jobs:
shell: bash
run: |
set -x
podman inspect ${{ env.IMAGE_REGISTRY }}/akmods${{ matrix.nvidia_tag }}:${{ env.KERNEL_FLAVOR }}-${{ env.FEDORA_VERSION }} > inspect.json
podman inspect ${{ env.IMAGE_REGISTRY }}/akmods${{ matrix.nvidia_tag }}:${{ env.KERNEL_FLAVOR }}-${{ env.FEDORA_VERSION }}-${{ env.KERNEL_VERSION }} > inspect.json
kernel=$(jq -r '.[]["Config"]["Labels"]["ostree.linux"]' inspect.json)
if [[ "${{ env.KERNEL_VERSION }}" != "$kernel"* ]]; then
echo "pulled akmods${{ matrix.nvidia_tag }} image kernel ($kernel) does not match expected kernel (${{ env.KERNEL_VERSION }})"
Expand Down Expand Up @@ -237,6 +237,7 @@ jobs:
FEDORA_VERSION=${{ env.FEDORA_VERSION }} \
IMAGE_REGISTRY=${{ env.IMAGE_REGISTRY }} \
KERNEL_FLAVOR=${{ env.KERNEL_FLAVOR }} \
KERNEL_VERSION=${{ env.KERNEL_VERSION }} \
NVIDIA_TAG=${{ matrix.nvidia_tag }} \
just containerfile "quay.io/fedora/fedora-coreos:${{ env.IMAGE_VERSION }}"

Expand Down
7 changes: 6 additions & 1 deletion ucore/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ IMAGE_REGISTRY := env("IMAGE_REGISTRY", "ghcr.io/ublue-os")
# lts uses stable CoreOS base with longterm kernel; stable and testing use stock coreos kernel
COREOS_STREAM := if UCORE_STREAM == 'lts' { 'stable' } else { UCORE_STREAM }
KERNEL_FLAVOR := env("KERNEL_FLAVOR", if UCORE_STREAM == 'lts' { "longterm-6.12" } else { 'coreos-' + COREOS_STREAM })
KERNEL_VERSION := env("KERNEL_VERSION", "")
NVIDIA_TAG := env("NVIDIA_TAG", "")
SELINUX := path_exists('/sys/fs/selinux')
TARGET_IMAGE := env("TARGET_IMAGE", "ucore-minimal")
Expand All @@ -33,9 +34,13 @@ upstream-image:
containerfile upstream_image='':
#!/usr/bin/env bash
set -x
KERNEL_VERSION=""
if [ -n "{{ KERNEL_VERSION }}" ]; then
KERNEL_VERSION="-{{ KERNEL_VERSION }}"
fi
declare -a CPP_FLAGS
CPP_FLAGS+=(
"-DAKMODS_TAG={{ KERNEL_FLAVOR }}-{{ FEDORA_VERSION }}"
"-DAKMODS_TAG={{ KERNEL_FLAVOR }}-{{ FEDORA_VERSION }}${KERNEL_VERSION}"
"-DUCORE={{ UCORE_STREAM }}"
"-DIMAGE_REGISTRY={{ IMAGE_REGISTRY }}"
"-DKERNEL={{ KERNEL_FLAVOR }}"
Expand Down