build Windows artifact with new container

This should get us a current version of Qt and many other newer libraries.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

.github/workflows/scripts/windows-in-container-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # this gets executed inside the container when building a Windows
-# installer on Travis
+# installer as GitHub Action
 #
 # working directory is assumed to be the directory including all the
 # source directories (subsurface, googlemaps, grantlee, etc)

.github/workflows/windows.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
     - master
+    - github-action-test
   pull_request:
     branches:
     - master
@@ -11,7 +12,7 @@ jobs:
   buildWindows:
     runs-on: ubuntu-latest
     container:
-      image: docker://subsurface/mxe-build-container:2.2
+      image: docker://subsurface/mxe-build-container:3.0.1
 
     steps:
     - name: checkout sources

packaging/windows/mxe-based-build.sh

@@ -150,7 +150,6 @@ fi
 if [ ! -f libdivecomputer/configure ] ; then
 	cd libdivecomputer
 	autoreconf --install
-	autoreconf --install
 fi
 
 # if this is a 64bit build then build libmtp as that isn't available via MXE

scripts/docker/mxe-build-container/Dockerfile

@@ -63,7 +63,7 @@ ADD qtconnectivity-1.patch /win/mxe/src/qtconnectivity-1.patch
 # Move the settings into place to build everything that we need
 # separate download from build so that we can redo the build
 ADD settings.mk /win/mxe/settings.mk
-RUN [ -f /usr/bin/python ] || ln -s /usr/bin/python3 /usr/bin/python
+RUN cd /usr/bin ; ln -s -f python3 python
 RUN cd /win/mxe ; \
     make -j 6 download 2>&1 | tee mxe-build.log
 RUN cd /win/mxe ; \

scripts/docker/mxe-build-container/build-container.sh

@@ -7,11 +7,12 @@ MXE_SHA="0d21cf2e31d4e6c0"
 SCRIPTPATH=$(dirname $0)
 
 # version of the docker image
-VERSION=3.0
+VERSION=3.0.1
 
 pushd $SCRIPTPATH
 
 # we use the 'experimental' --squash argument to significantly reduce the size of the massively huge
 # Docker container this produces
-docker build --squash -t subsurface/mxe-build-container:$VERSION --build-arg=mxe_sha=$MXE_SHA -f Dockerfile .
+docker build -t subsurface/mxe-build-container:$VERSION --build-arg=mxe_sha=$MXE_SHA -f Dockerfile .
+docker images
 popd