diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 5e5bdac3a96..beb21b2fd3e 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -310,6 +310,10 @@ jobs: io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/bluefin/bluefin/README.md io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4 + - name: Define env.SHA_HEAD_SHORT + run: | + echo "SHA_HEAD_SHORT=${GITHUB_SHA::7}" >> $GITHUB_ENV + - name: Pull images if: github.event_name == 'pull_request' && ( matrix.image_flavor == 'main' || matrix.image_flavor == 'nvidia' ) || github.event_name != 'pull_request' uses: Wandalen/wretry.action@6feedb7dedadeb826de0f45ff482b53b379a7844 # v3.5.0 @@ -342,6 +346,7 @@ jobs: BUILD_ARGS+=("--build-arg" "NVIDIA_TYPE=${{ env.nvidia_type }}") BUILD_ARGS+=("--build-arg" "KERNEL=${{ env.kernel_release }}") BUILD_ARGS+=("--build-arg" "UBLUE_IMAGE_TAG=${{ matrix.fedora_version }}") + BUILD_ARGS+=("--build-arg" "SHA_HEAD_SHORT=${{ env.SHA_HEAD_SHORT }}") TAG_ARGS=() IFS=' ' read -r -a tags_array <<< "${{ steps.generate-tags.outputs.alias_tags }}" diff --git a/Containerfile b/Containerfile index 916d80a04be..387b5957865 100644 --- a/Containerfile +++ b/Containerfile @@ -8,6 +8,7 @@ ARG TARGET_BASE="${TARGET_BASE:-bluefin}" ARG NVIDIA_TYPE="${NVIDIA_TYPE:-}" ARG KERNEL="${KERNEL:-6.9.7-200.fc40.x86_64}" ARG UBLUE_IMAGE_TAG="${UBLUE_IMAGE_TAG:-latest}" +ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}" # FROM's for Mounting ARG KMOD_SOURCE_COMMON="ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}" @@ -34,7 +35,7 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" ARG NVIDIA_TYPE="${NVIDIA_TYPE:-}" ARG KERNEL="${KERNEL:-6.9.7-200.fc40.x86_64}" ARG UBLUE_IMAGE_TAG="${UBLUE_IMAGE_TAG:-latest}" - +ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}" # Build, cleanup, commit. RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ @@ -65,6 +66,7 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" ARG NVIDIA_TYPE="${NVIDIA_TYPE:-}" ARG KERNEL="${KERNEL:-6.9.7-200.fc40.x86_64}" ARG UBLUE_IMAGE_TAG="${UBLUE_IMAGE_TAG:-latest}" +ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}" # Build, Clean-up, Commit RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ diff --git a/build_files/image-info.sh b/build_files/image-info.sh index fc41dcdf279..9d8bb6e579d 100755 --- a/build_files/image-info.sh +++ b/build_files/image-info.sh @@ -56,8 +56,5 @@ if [[ -n "${SHA_HEAD_SHORT:-}" ]]; then echo "BUILD_ID=\"$SHA_HEAD_SHORT\"" >> /usr/lib/os-release fi -# FIXME: Pretty name needs to have deck/KDE/GNOME/etc -echo "BOOTLOADER_NAME=\"$IMAGE_PRETTY_NAME $VERSION_PRETTY\"" >> /usr/lib/os-release - # Fix issues caused by ID no longer being fedora sed -i "s/^EFIDIR=.*/EFIDIR=\"fedora\"/" /usr/sbin/grub2-switch-to-blscfg \ No newline at end of file