fix: install correct packages for each variant (#9)

* fix: add debug statement for package install * fix: add FEDORA_EDITION build arg
ublue-os · Aug 18, 2024 · d58f4df · d58f4df
1 parent c95299d
commit d58f4df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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\")[])] \