fixup!

wxHaskell · Nov 28, 2023 · 5453c34 · 5453c34
1 parent 7b65575
commit 5453c34
Showing 1 changed file with 43 additions and 20 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,14 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         ghc: ["9.4.8"]
-        os: [ ubuntu-latest, windows-latest, macOS-latest ]
-        include:
-          - name: ubuntu-latest
-            shell: bash
-          - name: windows-latest
-            shell: msys2 {0}
-          - name: macOS-latest
-            shell: bash
+        os: [ ubuntu-latest, macOS-latest ]
 
     runs-on: ${{ matrix.os }}
 
@@ -31,15 +24,6 @@ jobs:
         with:
           ghc-version: ${{ matrix.ghc }}
 
-      - name: Install wxWidgets on Windows
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: CLANG64
-          platform-check-severity: warn
-          install: >-
-            mingw-w64-clang-x86_64-clang
-            mingw-w64-clang-x86_64-wxwidgets3.2-msw
-
       - name: Install wxWidgets on Ubuntu / macOS
         run: |
           if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
@@ -48,17 +32,56 @@ jobs:
             brew install wxwidgets
           fi
 
-
       - name: Configure project
-        shell: ${{ matrix.shell }}
         run: |
             echo "$SHELL"
             echo "$PATH"
             cabal configure
             cabal build all --dry-run
 
       - name: Build
-        shell: ${{ matrix.shell }}
+        run: |
+            echo "$SHELL"
+            echo "$PATH"
+            cabal build all
+
+  build-on-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        ghc: ["9.4.8"]
+        os: [ windows-latest ]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - run: git config --global core.autocrlf input
+      - uses: actions/checkout@v4
+
+      - uses: haskell/actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: ${{ matrix.ghc }}
+
+      - name: Install wxWidgets on Windows
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: CLANG64
+          install: >-
+            mingw-w64-clang-x86_64-clang
+            mingw-w64-clang-x86_64-wxwidgets3.2-msw
+
+      - shell: msys2 {0}
+        name: Configure project
+        run: |
+            echo "$SHELL"
+            echo "$PATH"
+            cabal configure
+            cabal build all --dry-run
+            cabal build all
+
+      - shell: msys2 {0}
+        name: Build
         run: |
             echo "$SHELL"
             echo "$PATH"