handle defaults

ublue-os · Nov 2, 2024 · 757df34 · 757df34
1 parent b05c715
commit 757df34
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 54 deletions.
diff --git a/.github/workflows/build-image-beta.yml b/.github/workflows/build-image-beta.yml
@@ -18,33 +18,22 @@ on:
   workflow_dispatch:
     inputs:
       base_name:
-        default: 'bluefin'
+        description: 'Image Brand to Build'
+        default: '["bluefin"]'
         type: choice
         options:
-          - bluefin
-          - aurora
+          - '["bluefin"]'
+          - '["aurora"]'
+          - '["bluefin", "aurora"]'
 
 jobs:
   build-image-beta:
-    if: github.event_name != 'workflow_dispatch'
     name: Build Beta Images
     uses: ./.github/workflows/reusable-build.yml
     secrets: inherit
     strategy:
       matrix:
-        base_name: [bluefin, aurora]
+        base_name: ${{ fromJson(inputs.base_name) || fromJson('["bluefin", "aurora"]') }}
     with:
       base_name: ${{ matrix.base_name }}
       fedora_version: beta
-
-  build-image-beta-call:
-    if: github.event_name == 'workflow_dispatch'
-    name: Build Latest Images
-    uses: ./.github/workflows/reusable-build.yml
-    secrets: inherit
-    strategy:
-      matrix:
-        base_name: [bluefin, aurora]
-    with:
-      base_name: ${{ inputs.base_name }}
-      fedora_version: latest
diff --git a/.github/workflows/build-image-latest.yml b/.github/workflows/build-image-latest.yml
@@ -18,35 +18,22 @@ on:
   workflow_dispatch:
     inputs:
       base_name:
-        default: 'bluefin'
+        description: 'Image Brand to Build'
+        default: '["bluefin"]'
         type: choice
         options:
-          - bluefin
-          - aurora
+          - '["bluefin"]'
+          - '["aurora"]'
+          - '["bluefin", "aurora"]'
 
 jobs:
   build-image-latest:
-    if: github.event_name != 'workflow_dispatch'
     name: Build Latest Images
     uses: ./.github/workflows/reusable-build.yml
     secrets: inherit
     strategy:
       matrix:
-        base_name: [bluefin, aurora]
+        base_name: ${{ fromJson(inputs.base_name) || fromJson('["bluefin", "aurora"]') }}
     with:
-      image_flavors: "['main', 'nvidia', 'hwe', 'hwe-nvidia']"
       base_name: ${{ matrix.base_name }}
       fedora_version: latest
-
-  build-image-latest-call:
-    if: github.event_name == 'workflow_dispatch'
-    name: Build Latest Images
-    uses: ./.github/workflows/reusable-build.yml
-    secrets: inherit
-    strategy:
-      matrix:
-        base_name: [bluefin, aurora]
-    with:
-      image_flavors: "['main', 'nvidia', 'hwe', 'hwe-nvidia']"
-      base_name: ${{ inputs.base_name }}
-      fedora_version: latest
diff --git a/.github/workflows/build-image-stable.yml b/.github/workflows/build-image-stable.yml
@@ -12,34 +12,22 @@ on:
   workflow_dispatch:
     inputs:
       base_name:
-        default: 'bluefin'
+        description: 'Image Brand to Build'
+        default: '["bluefin"]'
         type: choice
         options:
-          - bluefin
-          - aurora
+          - '["bluefin"]'
+          - '["aurora"]'
+          - '["bluefin", "aurora"]'
 
 jobs:
   build-image-stable:
-    if: github.event_name != 'workflow_dispatch'
     name: Build Stable Images
     uses: ./.github/workflows/reusable-build.yml
     secrets: inherit
     strategy:
       matrix:
-        base_name: [bluefin, aurora]
+        base_name: ${{ fromJson(inputs.base_name) || fromJson('["bluefin", "aurora"]') }}
     with:
       base_name: ${{ matrix.base_name }}
       fedora_version: stable
-
-  build-image-stable-call:
-    if: github.event_name == 'workflow_dispatch'
-    name: Build Latest Images
-    uses: ./.github/workflows/reusable-build.yml
-    secrets: inherit
-    strategy:
-      matrix:
-        base_name: [bluefin, aurora]
-    with:
-      base_name: ${{ inputs.base_name }}
-      fedora_version: latest
-