From 49efcaf10470176bdbb5c8094c4974e17ce289b9 Mon Sep 17 00:00:00 2001
From: Adam Boutcher <adam.j.boutcher@durham.ac.uk>
Date: Wed, 25 Aug 2021 10:30:58 +0100
Subject: [PATCH] Windows 32bit for unstable, Windows 32/64 and darwin 64 for
 stable.

---
 .github/workflows/2_unstable.yml |  2 +
 .github/workflows/3_stable.yml   | 68 ++++++++++++++++----------------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml
index c9a18933..71b9cad8 100644
--- a/.github/workflows/2_unstable.yml
+++ b/.github/workflows/2_unstable.yml
@@ -64,6 +64,8 @@ jobs:
         include:
           - platform: darwin
             arch: amd64
+          - platform: windows
+            arch: 386
           - platform: windows
             arch: amd64
 
diff --git a/.github/workflows/3_stable.yml b/.github/workflows/3_stable.yml
index 71fec2ad..3c5537c0 100644
--- a/.github/workflows/3_stable.yml
+++ b/.github/workflows/3_stable.yml
@@ -74,11 +74,13 @@ jobs:
       matrix:
         platform: [linux]
         arch: [386, amd64, arm-7, arm-6, arm64]
-#        include:
-#          - platform: darwin
-#            arch: amd64
-#          - platform: windows
-#            arch: amd64
+        include:
+          - platform: darwin
+            arch: amd64
+          - platform: windows
+            arch: 386
+          - platform: windows
+            arch: amd64
 
     steps:
       - uses: actions/checkout@v2
@@ -108,17 +110,17 @@ jobs:
           echo "XGO_TAGS=netgo osusergo linux sqlite_omit_load_extension" >> $GITHUB_ENV
         shell: bash
 
-#      - name: Set Darwin Build Flags
-#        if: matrix.platform == 'darwin'
-#        run: echo "XGO_TAGS=netgo osusergo darwin sqlite_omit_load_extension" >> $GITHUB_ENV
-#        shell: bash
+      - name: Set Darwin Build Flags
+        if: matrix.platform == 'darwin'
+        run: echo "XGO_TAGS=netgo osusergo darwin sqlite_omit_load_extension" >> $GITHUB_ENV
+        shell: bash
 
-#      - name: Set Windows Build Flags
-#        if: matrix.platform == 'windows'
-#        run: |
-#          echo "BUILD_FLAGS=-extldflags -static" >> $GITHUB_ENV
-#          echo "XGO_TAGS=netgo osusergo sqlite_omit_load_extension" >> $GITHUB_ENV
-#        shell: bash
+      - name: Set Windows Build Flags
+        if: matrix.platform == 'windows'
+        run: |
+          echo "BUILD_FLAGS=-extldflags -static -buildmode=exe" >> $GITHUB_ENV
+          echo "XGO_TAGS=netgo osusergo sqlite_omit_load_extension" >> $GITHUB_ENV
+        shell: bash
 
       - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
         uses: crazy-max/ghaction-xgo@v1
@@ -148,25 +150,25 @@ jobs:
           rm -rf statping
           echo "compressed=statping-linux-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV
 
-#      - name: Compress Windows Builds
-#        if: matrix.platform == 'windows'
-#        run: |
-#          cd build
-#          mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe
-#          chmod +x statping.exe
-#          zip statping-windows-${{ matrix.arch }}.zip statping.exe
-#          rm -rf statping.exe
-#          echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV
+      - name: Compress Windows Builds
+        if: matrix.platform == 'windows'
+        run: |
+          cd build
+          mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe
+          chmod +x statping.exe
+          zip statping-windows-${{ matrix.arch }}.zip statping.exe
+          rm -rf statping.exe
+          echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV
 
-#      - name: Compress Darwin Builds
-#        if: matrix.platform == 'darwin'
-#        run: |
-#          cd build
-#          mv statping-darwin-10.6-${{ matrix.arch }} statping
-#          chmod +x statping
-#          tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping
-#          rm -rf statping
-#          echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV
+      - name: Compress Darwin Builds
+        if: matrix.platform == 'darwin'
+        run: |
+          cd build
+          mv statping-darwin-10.12-${{ matrix.arch }} statping
+          chmod +x statping
+          tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping
+          rm -rf statping
+          echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV
 
       - name: Upload Compiled Statping Binary
         uses: actions/upload-artifact@v1