fix: improve handling of zfs tag for hci images

ublue-os · Aug 10, 2023 · f33860d · f33860d
1 parent ab204e5
commit f33860d
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -386,9 +386,9 @@ jobs:
         coreos_version:
           - stable
           - testing
-        add_zfs:
-          - false
-          - true
+        zfs_tag:
+          - "-zfs"
+          - ""
         pr_prefix:
           - ${{ needs.build_info.outputs.pr_prefix }}
         include:
@@ -407,10 +407,7 @@ jobs:
         run: |
           # Generate a timestamp for creating an image version history
           TIMESTAMP="$(date +%Y%m%d)"
-          COREOS_VERSION="${{ matrix.coreos_version }}"
-          if [[ "${{ matrix.add_zfs }}" == "true" ]]; then
-              COREOS_VERSION="${{ matrix.coreos_version }}-zfs"
-          fi
+          COREOS_VERSION="${{ matrix.coreos_version }}${{ matrix.zfs_tag }}"
 
           COMMIT_TAGS=()
           BUILD_TAGS=()
@@ -468,7 +465,7 @@ jobs:
           build-args: |
             COREOS_VERSION=${{ matrix.coreos_version }}
             PR_PREFIX=${{ matrix.pr_prefix }}
-            ZFS_TAG=${{ 'true' == matrix.add_zfs && '-zfs' || '' }}
+            ZFS_TAG=${{ matrix.zfs_tag }}
           labels: ${{ steps.meta.outputs.labels }}
           oci: false