From d58f4df4c9b88fad4e492bd4194e5fca27bbc731 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sun, 18 Aug 2024 09:01:28 +0100 Subject: [PATCH] fix: install correct packages for each variant (#9) * fix: add debug statement for package install * fix: add FEDORA_EDITION build arg --- .github/workflows/reusable-build.yaml | 1 + scripts/_base/003-packages.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/reusable-build.yaml b/.github/workflows/reusable-build.yaml index e99f651..efdd5c9 100644 --- a/.github/workflows/reusable-build.yaml +++ b/.github/workflows/reusable-build.yaml @@ -174,6 +174,7 @@ jobs: build-args: | IMAGE_NAME=${{ matrix.image_name }} FEDORA_VERSION=${{ matrix.fedora_version }} + FEDORA_EDITION=${{ matrix.image_name }} labels: ${{ steps.meta.outputs.labels }} tags: ${{ steps.meta.outputs.tags }} diff --git a/scripts/_base/003-packages.sh b/scripts/_base/003-packages.sh index acca97b..e0be341 100644 --- a/scripts/_base/003-packages.sh +++ b/scripts/_base/003-packages.sh @@ -32,6 +32,8 @@ if [[ -z "$FEDORA_VERSION" ]]; then exit 1 fi +echo "Installing packages for $DESKTOP_ENVIRONMENT" + # build list of all packages requested for inclusion INCLUDED_PACKAGES=($(jq -r "[(.all.include | (.all, select(.\"$DESKTOP_ENVIRONMENT\" != null).\"$DESKTOP_ENVIRONMENT\")[]), \ (select(.\"$FEDORA_VERSION\" != null).\"$FEDORA_VERSION\".include | (.all, select(.\"$DESKTOP_ENVIRONMENT\" != null).\"$DESKTOP_ENVIRONMENT\")[])] \