fix build dependencies, try to build for 32 bits Windows

Sauci · Feb 12, 2024 · 2e00ca7 · 2e00ca7
1 parent d16eb28
commit 2e00ca7
Showing 1 changed file with 18 additions and 36 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -86,8 +86,6 @@ jobs:
     runs-on: ubuntu-22.04
     needs:
       - test-linux
-      - test-windows
-#      - test-mac
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
@@ -107,12 +105,26 @@ jobs:
           path: |
             *.so
             *.h
-  build-windows-32:
+  build-windows:
     runs-on: windows-2019
     needs:
-      - test-linux
       - test-windows
-#      - test-mac
+    strategy:
+      matrix:
+        mingw: [ "MINGW32", "MINGW64" ]
+        include:
+#          - mingw: "MINGW32"
+#            package: "mingw-w64-i686"
+#            GOARCH: 386
+          - mingw: "MINGW64"
+            package: "mingw-w64-x86_64"
+            GOARCH: amd64
+    env:
+      MSYSTEM: ${{ matrix.mingw }}
+      CHERE_INVOKING: 1
+      GOARCH: ${{ matrix.GOARCH }}
+      CGO_ENABLED: 1
+    name: MSYS2 ${{ matrix.mingw }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
@@ -123,33 +135,6 @@ jobs:
         with:
           name: grpc
           path: pkg/a2l
-      - run: |
-          go get github.com/antlr4-go/antlr/v4
-          $env:GOARCH=386
-          $env:CGO_ENABLED=1
-          go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go
-      - uses: actions/upload-artifact@v4
-        with:
-          name: windows
-          path: |
-            *.dll
-            *.h
-  build-windows-64:
-    runs-on: windows-2019
-    needs:
-      - test-linux
-      - test-windows
-#      - test-mac
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
-        with:
-          name: antlr4
-          path: pkg/a2l/parser
-      - uses: actions/download-artifact@v3
-        with:
-          name: grpc
-          path: pkg/a2l
       - run: |
           go get github.com/antlr4-go/antlr/v4
           go build --buildmode=c-shared -o a2l_grpc_$(go env GOOS)_$(go env GOARCH).dll ./cmd/a2l/a2l.go
@@ -162,8 +147,6 @@ jobs:
 #  build-mac:
 #    runs-on: macos-latest-xlarge
 #    needs:
-#      - test-linux
-#      - test-windows
 #      - test-mac
 #    steps:
 #      - uses: actions/checkout@v4
@@ -204,8 +187,7 @@ jobs:
       contents: write
     needs:
       - build-linux
-      - build-windows-32
-      - build-windows-64
+      - build-windows
 #      - build-mac
       - export-protobuf-definitions
     if: startsWith(github.ref, 'refs/tags/v')