Merge pull request #79 from yuravk/master

CI:  correct jobs matrix and Mattermost message heading

Author: andrewlukoshko

.github/workflows/build-rpi-github-hosted.yml

@@ -65,12 +65,14 @@ jobs:
   build-image:
     name: ${{ inputs.version_major }} '${{ matrix.image_types }}' ${{ matrix.partitioning }} image
     runs-on: ubuntu-24.04
+    # Skip if 8 and GPT or Kitten and MBR
+    if: ${{ ( inputs.gpt && inputs.version_major != '8' || inputs.mbr && inputs.version_major != '10-kitten' ) && ( inputs.console || inputs.gnome ) && ( inputs.mbr || inputs.gpt ) }}
     strategy:
       fail-fast: false
       matrix:
         # Set matrix based on boolean inputs.* with true value
-        image_types: ${{ fromJSON(format('["{0}", "{1}"]', ( inputs.console && 'console' ), ( inputs.gnome && 'gnome' ) )) }}
-        partitioning: ${{ fromJSON(format('["{0}", "{1}"]', ( inputs.mbr && 'mbr' ), ( inputs.gpt && 'gpt' ) )) }}
+        image_types: ${{ fromJSON(format('["{0}", "{1}"]', inputs.console && 'console' || 'false', inputs.gnome && 'gnome' || 'false' )) }}
+        partitioning: ${{ fromJSON(format('["{0}", "{1}"]', inputs.mbr && 'mbr' || 'false', inputs.gpt && 'gpt' || 'false' )) }}
         version_major: ${{ fromJSON(format('["{0}"]', inputs.version_major )) }}
         exclude:
           - image_types: 'false'
@@ -476,7 +478,7 @@ jobs:
         MATTERMOST_CHANNEL: ${{ vars.MATTERMOST_CHANNEL }}
         MATTERMOST_USERNAME: ${{ github.triggering_actor }}
         TEXT: |
-          **AlmaLinux OS ${{ env.kitten }}${{ env.full_release_version }} Raspberry Pi image Build** `${{ env.date_time_stamp }}` generated by the GitHub [Action](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
+          **AlmaLinux OS ${{ env.release_str }} Raspberry Pi image Build** `${{ env.date_time_stamp }}` generated by the GitHub [Action](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
           :almalinux: **${{ matrix.image_types }} ${{ matrix.partitioning }}**
 

.github/workflows/build-rpi.yml

@@ -69,12 +69,14 @@ jobs:
     runs-on: ubuntu-24.04
     permissions:
       actions: write
+    # Skip if 8 and GPT or Kitten and MBR
+    if: ${{ ( inputs.gpt && inputs.version_major != '8' || inputs.mbr && inputs.version_major != '10-kitten' ) && ( inputs.console || inputs.gnome ) && ( inputs.mbr || inputs.gpt ) }}
     strategy:
       fail-fast: false
       matrix:
         # Set matrix based on boolean inputs.* with true value
-        image_types: ${{ fromJSON(format('["{0}", "{1}"]', ( inputs.console && 'console' ), ( inputs.gnome && 'gnome' ) )) }}
-        partitioning: ${{ fromJSON(format('["{0}", "{1}"]', ( inputs.mbr && 'mbr' ), ( inputs.gpt && 'gpt' ) )) }}
+        image_types: ${{ fromJSON(format('["{0}", "{1}"]', inputs.console && 'console' || 'false', inputs.gnome && 'gnome' || 'false' )) }}
+        partitioning: ${{ fromJSON(format('["{0}", "{1}"]', inputs.mbr && 'mbr' || 'false', inputs.gpt && 'gpt' || 'false' )) }}
         version_major: ${{ fromJSON(format('["{0}"]', inputs.version_major )) }}
         exclude:
           - image_types: 'false'
@@ -120,8 +122,8 @@ jobs:
       # max-parallel: 1
       matrix:
         # Set matrix based on boolean inputs.* with true value
-        image_types: ${{ fromJSON(format('["{0}", "{1}"]', ( inputs.console && 'console' ), ( inputs.gnome && 'gnome' ) )) }}
-        partitioning: ${{ fromJSON(format('["{0}", "{1}"]', ( inputs.mbr && 'mbr' ), ( inputs.gpt && 'gpt' ) )) }}
+        image_types: ${{ fromJSON(format('["{0}", "{1}"]', inputs.console && 'console' || 'false', inputs.gnome && 'gnome' || 'false' )) }}
+        partitioning: ${{ fromJSON(format('["{0}", "{1}"]', inputs.mbr && 'mbr' || 'false', inputs.gpt && 'gpt' || 'false' )) }}
         version_major: ${{ fromJSON(format('["{0}"]', inputs.version_major )) }}
         exclude:
           - image_types: 'false'