Merge branch 'do_release_builds' into origin_master

.github/workflows/android.yml

@@ -1,7 +1,6 @@
 name: Android
 
 on:
-  workflow_dispatch:
   push:
     paths-ignore:
     - scripts/docker/**

.github/workflows/mac.yml

@@ -58,7 +58,7 @@ jobs:
         export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
 
         # now setup Subsurface with WebKit and build the dependencies, using the generic build script
-        bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -release -build-deps -ftdi -prep-only ${BUILD_EXTRA_ARGS}
+        bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -build-deps -ftdi -prep-only ${BUILD_EXTRA_ARGS}
 
         echo "finished initial cmake setup of Subsurface - next build the package"
         cd subsurface/build

packaging/windows/in-container-build.sh

@@ -13,9 +13,15 @@ set -e
 mkdir -p win32
 cd win32
 
+BUILD_EXTRA_ARGS="debug"
+if [[ "$1" == "-release" ]]; then
+    BUILD_EXTRA_ARGS=""
+    shift
+fi
+
 # build Subsurface
 export MXEBUILDTYPE=x86_64-w64-mingw32.shared
-bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer
+bash -ex ../subsurface/packaging/windows/mxe-based-build.sh ${BUILD_EXTRA_ARGS} installer
 
 # the strange two step move is in order to get predictable names to use
 # in the publish step of the GitHub Action
@@ -25,7 +31,7 @@ mv subsurface/"$fullname" ${OUTPUT_DIR}/"${fullname%.exe}-installer.exe"
 
 # build Subsurface for smtk2ssrf
 
-bash -ex ../subsurface/packaging/windows/mxe-based-build.sh -noftdi -nolibraw subsurface
+bash -ex ../subsurface/packaging/windows/mxe-based-build.sh -noftdi -nolibraw ${BUILD_EXTRA_ARGS} subsurface
 
 bash -ex ../subsurface/packaging/windows/smtk2ssrf-mxe-build.sh -a -i