windows.yml: Add msys2; remove msvc

andy5995 · Nov 12, 2024 · 38ff71d · 38ff71d
1 parent fe0a2a4
commit 38ff71d
Showing 1 changed file with 66 additions and 65 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -24,79 +24,80 @@ on:
     - '**/windows.yml'
 
 jobs:
-  VisualStudio:
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: ['x64', 'x86']
-    steps:
-      - uses: actions/checkout@v4
+  MSYS2:
+      runs-on: windows-latest
+      strategy:
+        fail-fast: false
+        matrix:
+          platform: ['UCRT64', 'CLANG64']
+      steps:
+        - uses: actions/checkout@v4
 
-      # Install a 32-bit Python so building related stuff work.
-      - name: Setup x86 Python
-        if: matrix.platform == 'x86'
-        uses: actions/setup-python@v5
-        with:
-          architecture: 'x86'
-          python-version: '3.12'
+        - uses: msys2/setup-msys2@v2
+          with:
+            msystem: ${{matrix.platform}}
+            pacboy: >-
+              cc:p
+              cmake:p
+              ninja:p
+              pkgconf:p
+              python-certifi:p
+              python-pip:p
+            # Make sure Python is updated to >=3.11 (fix https://github.com/msys2/MINGW-packages/issues/17415).
+            update: true
 
-      # https://github.com/actions/runner-images/issues/5459#issuecomment-1532856844
-      - name: Remove bad Strawberry Perl patch binary in search path
-        run: del C:\Strawberry\c\bin\patch.EXE
+        - name: Install packages
+          shell: msys2 {0}
+          run: |
+            python -m pip install --pre meson
 
-      - name: Install packages
-        run: |
-          python -m pip install --pre meson
+        - name: Configure
+          shell: msys2 {0}
+          run: meson setup builddir -Ddefault_library=static -Db_sanitize=none
 
-      - uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: ${{matrix.platform}}
-      - name: Configure
-        run: meson setup builddir -Ddefault_library=static -Db_sanitize=none
+        - name: Build
+          shell: msys2 {0}
+          run: meson compile -C builddir
 
-      - name: Build
-        run: meson compile -C builddir
+        - name: Test
+          shell: msys2 {0}
+          run: meson test -C builddir || cat builddir\meson-logs\testlog.txt
 
-      - name: Test
-        run: |
-          meson test -C builddir || cat builddir\meson-logs\testlog.txt
+  # https://github.com/andy5995/canfigger/issues/31
+  #VisualStudio:
+    #runs-on: windows-latest
+    #strategy:
+      #fail-fast: false
+      #matrix:
+        #platform: ['x64', 'x86']
+    #steps:
+      #- uses: actions/checkout@v4
 
-  #MSYS2:
-      #runs-on: windows-latest
-      #strategy:
-        #fail-fast: false
-        #matrix:
-          #platform: ['UCRT64', 'CLANG64']
-      #steps:
-        #- uses: actions/checkout@v4
-          #with:
-            #fetch-depth: 0
+      ## Install a 32-bit Python so building related stuff work.
+      #- name: Setup x86 Python
+        #if: matrix.platform == 'x86'
+        #uses: actions/setup-python@v5
+        #with:
+          #architecture: 'x86'
+          #python-version: '3.12'
 
-        #- uses: msys2/setup-msys2@v2
-          #with:
-            #msystem: ${{matrix.platform}}
-            #install: >-
-              #bison
-              #dos2unix
-              #git
-            #pacboy: >-
-              #cc:p
-              #cmake:p
-              #ninja:p
-              #pkgconf:p
-              #python-certifi:p
-              #python-pip:p
-            ## Make sure Python is updated to >=3.11 (fix https://github.com/msys2/MINGW-packages/issues/17415).
-            #update: true
+      ## https://github.com/actions/runner-images/issues/5459#issuecomment-1532856844
+      #- name: Remove bad Strawberry Perl patch binary in search path
+        #run: del C:\Strawberry\c\bin\patch.EXE
 
-        #- name: Install packages
-          #shell: msys2 {0}
-          #run: |
-            #python -m pip install --pre meson
+      #- name: Install packages
+        #run: |
+          #python -m pip install --pre meson
 
-        #- name: Sanity Checks
-          #shell: msys2 {0}
-          #run: |
-            #python tools/sanity_checks.py
+      #- uses: ilammy/msvc-dev-cmd@v1
+        #with:
+          #arch: ${{matrix.platform}}
+      #- name: Configure
+        #run: meson setup builddir -Ddefault_library=static -Db_sanitize=none
 
+      #- name: Build
+        #run: meson compile -C builddir
+
+      #- name: Test
+        #run: |
+          #meson test -C builddir || cat builddir\meson-logs\testlog.txt