Simplify testing.

ghdl · Jan 16, 2025 · ef3c6ba · ef3c6ba
1 parent 33cadaa
commit ef3c6ba
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -51,6 +51,17 @@ jobs:
         shell: bash
 
     steps:
+      - name: Detect correct shell
+        id: shell
+        shell: bash
+        run: |
+          # Detect correct shell
+          if [[ "${{ matrix.name }}" == "Windows" && "${{ matrix.runtime }}" != "" ]]; then
+            printf "shell=msys2 {0}" >> $GITHUB_OUTPUT
+          else
+            printf "shell=bash" >> $GITHUB_OUTPUT
+          fi
+
       - name: 🟦 Setup MSYS2 for ${{ matrix.runtime }}
         uses: msys2/setup-msys2@v2
         if: matrix.runtime != ''
@@ -67,11 +78,9 @@ jobs:
           investigate: true
 
       - name: Verify on Linux or macOS
-        if: matrix.name == 'Ubuntu' || matrix.name == 'macOS'
         run: |
-          printf "%s\n" "${PATH}"
+          printf "which ghdl: %s\n" "$(which ghdl)"
 
-          which ghdl
           ghdl --version
 
       - name: Verify on Windows (native)
@@ -80,10 +89,3 @@ jobs:
         run: |
           echo $(Get-Command ghdl).Source
           ghdl --version
-
-      - name: Verify on Windows + MSYS2
-        if: matrix.name == 'Windows' && matrix.runtime != ''
-        shell: 'msys2 {0}'
-        run: |
-          which ghdl
-          ghdl --version