build-and-deploy: set MINGW_ARCH appropriately for i686/x86_64 builds

In the future, we want to build the packages in the appropriate git-sdk
for the given CPU architecture. Right now, we still build i686/x86_64
MINGW packages in git-sdk-64.

Let's respect the `ARCHITECTURE` environment variable (which is left
empty in the current workflow runs that want to build i686/x86_64 MINGW
packages), and set `MINGW_ARCH` appropriately when the `ARCHITECTURE`
is set to `i686` or `x86_64` (which we will do in the future).

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

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

@@ -241,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
           )