Merge pull request #129 from git-for-windows/prepare-for-i686-mingw-builds

Prepare for i686-only MINGW builds

Author: dscho

.github/workflows/build-and-deploy.yml

@@ -8,7 +8,7 @@ on:
         description: 'The package to build'
         required: true
       build_only:
-        description: 'Skip deployment (if non-empty)'
+        description: 'Skip deployment (if "true")'
         required: false
       repo:
         description: 'The repo containing the package definition'
@@ -115,6 +115,7 @@ jobs:
           git -C /usr/src/$REPO reset --hard FETCH_HEAD
 
       - name: check if the package was already deployed
+        if: env.BUILD_ONLY != 'true'
         shell: bash
         run: |
           ./update-scripts/ensure-not-yet-deployed.sh${{ env.ARCHITECTURE != '' && format(' --architecture={0}', env.ARCHITECTURE) || '' }} "/usr/src/$REPO/$PACKAGE_TO_BUILD"
@@ -240,10 +241,12 @@ jobs:
           MINGW_ARCHS_TO_BUILD=$(
                     case "$ARCHITECTURE,$PACKAGE_TO_BUILD" in
                     aarch64,*) echo "clangarm64";;
-                    *,mingw-w64-wintoast) echo "mingw32 mingw64 clangarm64";; # We're (cross-)compiling via Visual Studio
-                    *,mingw-w64-git-credential-manager) echo "mingw32 mingw64 clangarm64";; # We're downloading the pre-built x86 artifacts and using them for all three platforms
-                    *,mingw-w64-git-lfs) echo "mingw32 mingw64 clangarm64";; # We're downloading the pre-built artifacts from Git LFS' official release page
-                    *) echo "mingw32 mingw64";;
+                    x86_64,*) echo "mingw64";;
+                    i686,*) echo "mingw32";;
+                    ,mingw-w64-wintoast) echo "mingw32 mingw64 clangarm64";; # We're (cross-)compiling via Visual Studio
+                    ,mingw-w64-git-credential-manager) echo "mingw32 mingw64 clangarm64";; # We're downloading the pre-built x86 artifacts and using them for all three platforms
+                    ,mingw-w64-git-lfs) echo "mingw32 mingw64 clangarm64";; # We're downloading the pre-built artifacts from Git LFS' official release page
+                    ,*) echo "mingw32 mingw64";;
                     esac
           )