fix test stages

regolith-linux · Dec 14, 2024 · 291c775 · 291c775
1 parent 032c77e
commit 291c775
Showing 1 changed file with 36 additions and 36 deletions.
diff --git a/.github/workflows/test-desktop-installable2.yml b/.github/workflows/test-desktop-installable2.yml
@@ -91,15 +91,15 @@ jobs:
       - name: Calculate Matrix
         id: calc-matrix
         run: |
-          debian_bullseye="unstable, testing, stable, release-3_0, release-3_1"
-          debian_bookworm="unstable, testing, stable, release-3_2"
-          debian_testing="unstable, testing" # testing is never released
-          ubuntu_focal="unstable, testing, stable, release-3_0, release-3_1"
-          ubuntu_jammy="unstable, testing, stable, release-3_0, release-3_1, release-3_2"
-          ubuntu_lunar="unstable, testing, stable, release-3_0"
-          ubuntu_mantic="unstable, testing, stable, release-3_1"
-          ubuntu_noble="unstable, testing, stable, release-3_2"
-          ubuntu_oracular="unstable, testing"
+          debian_bullseye=(unstable testing stable release-3_0 release-3_1)
+          debian_bookworm=(unstable testing stable release-3_2)
+          debian_testing=(unstable testing) # testing is never released
+          ubuntu_focal=(unstable testing stable release-3_0 release-3_1)
+          ubuntu_jammy=(unstable testing stable release-3_0 release-3_1 release-3_2)
+          ubuntu_lunar=(unstable testing stable release-3_0)
+          ubuntu_mantic=(unstable testing stable release-3_1)
+          ubuntu_noble=(unstable testing stable release-3_2)
+          ubuntu_oracular=(unstable testing)
 
           debian_bullseye_list=()
           debian_bookworm_list=()
@@ -112,43 +112,43 @@ jobs:
           ubuntu_oracular_list=()
 
           if [ -n "${{ inputs.stage }}" ] && [ "${{ inputs.stage }}" != "all" ]; then
-            if [[ "$debian_bullseye" == *"${{ inputs.stage }}"* ]]; then
-              debian_bullseye_list=(${{ inputs.stage }})
+            if [[ " ${debian_bullseye[*]} " =~ [[:space:]]${{ inputs.stage }}[[:space:]] ]]; then
+                debian_bullseye_list=(${{ inputs.stage }})
             fi
-            if [[ "$debian_bookworm" == *"${{ inputs.stage }}"* ]]; then
-              debian_bookworm_list=(${{ inputs.stage }})
+            if [[ " ${debian_bookworm[*]} " =~ [[:space:]]${{ inputs.stage }}[[:space:]] ]]; then
+                debian_bookworm_list=(${{ inputs.stage }})
             fi
-            if [[ "$debian_testing" == *"${{ inputs.stage }}"* ]]; then
-              debian_testing_list=(${{ inputs.stage }})
+            if [[ " ${debian_testing[*]} " =~ [[:space:]]${{ inputs.stage }}[[:space:]] ]]; then
+                debian_testing_list=(${{ inputs.stage }})
             fi
-            if [[ "$ubuntu_focal" == *"${{ inputs.stage }}"* ]]; then
-              ubuntu_focal_list=(${{ inputs.stage }})
+            if [[ " ${ubuntu_focal[*]} " =~ [[:space:]]${{ inputs.stage }}[[:space:]] ]]; then
+                ubuntu_focal_list=(${{ inputs.stage }})
             fi
-            if [[ "$ubuntu_jammy" == *"${{ inputs.stage }}"* ]]; then
-              ubuntu_jammy_list=(${{ inputs.stage }})
+            if [[ " ${ubuntu_jammy[*]} " =~ [[:space:]]${{ inputs.stage }}[[:space:]] ]]; then
+                ubuntu_jammy_list=(${{ inputs.stage }})
             fi
-            if [[ "$ubuntu_lunar" == *"${{ inputs.stage }}"* ]]; then
-              ubuntu_lunar_list=(${{ inputs.stage }})
+            if [[ " ${ubuntu_lunar[*]} " =~ [[:space:]]${{ inputs.stage }}[[:space:]] ]]; then
+                ubuntu_lunar_list=(${{ inputs.stage }})
             fi
-            if [[ "$ubuntu_mantic" == *"${{ inputs.stage }}"* ]]; then
-              ubuntu_mantic_list=(${{ inputs.stage }})
+            if [[ " ${ubuntu_mantic[*]} " =~ [[:space:]]${{ inputs.stage }}[[:space:]] ]]; then
+                ubuntu_mantic_list=(${{ inputs.stage }})
             fi
-            if [[ "$ubuntu_noble" == *"${{ inputs.stage }}"* ]]; then
-              ubuntu_noble_list=(${{ inputs.stage }})
+            if [[ " ${ubuntu_noble[*]} " =~ [[:space:]]${{ inputs.stage }}[[:space:]] ]]; then
+                ubuntu_noble_list=(${{ inputs.stage }})
             fi
-            if [[ "$ubuntu_oracular" == *"${{ inputs.stage }}"* ]]; then
-              ubuntu_oracular_list=(${{ inputs.stage }})
+            if [[ " ${ubuntu_oracular[*]} " =~ [[:space:]]${{ inputs.stage }}[[:space:]] ]]; then
+                ubuntu_oracular_list=(${{ inputs.stage }})
             fi
           else
-            debian_bullseye_list=($debian_bullseye)
-            debian_bookworm_list=($debian_bookworm)
-            debian_testing_list=($debian_testing)
-            ubuntu_focal_list=($ubuntu_focal)
-            ubuntu_jammy_list=($ubuntu_jammy)
-            ubuntu_lunar_list=($ubuntu_lunar)
-            ubuntu_mantic_list=($ubuntu_mantic)
-            ubuntu_noble_list=($ubuntu_noble)
-            ubuntu_oracular_list=($ubuntu_oracular)
+            debian_bullseye_list=(${debian_bullseye[@]})
+            debian_bookworm_list=(${debian_bookworm[@]})
+            debian_testing_list=(${debian_testing[@]})
+            ubuntu_focal_list=(${ubuntu_focal[@]})
+            ubuntu_jammy_list=(${ubuntu_jammy[@]})
+            ubuntu_lunar_list=(${ubuntu_lunar[@]})
+            ubuntu_mantic_list=(${ubuntu_mantic[@]})
+            ubuntu_noble_list=(${ubuntu_noble[@]})
+            ubuntu_oracular_list=(${ubuntu_oracular[@]})
           fi
 
           STAGES=$(jq -n -c \