summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-29 13:03:56 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-30 12:24:36 -0700
commitbd0d7bd0faa1ff735f929e67d8dd9408a527c5d9 (patch)
tree01c51b03ac9c71f4e4679edb3ac07d98f507bfd6 /.github/workflows
parente71e715cd347d3dc1e503695d7a747f175123e9e (diff)
downloadsubsurface-bd0d7bd0faa1ff735f929e67d8dd9408a527c5d9.tar.gz
build-system: switch GitHub Action Windows build to 64 bit
This is using the new build container with a 64bit MXE system. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/scripts/windows-in-container-build.sh2
-rw-r--r--.github/workflows/windows.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/scripts/windows-in-container-build.sh b/.github/workflows/scripts/windows-in-container-build.sh
index 1993f98bc..cf73465de 100644
--- a/.github/workflows/scripts/windows-in-container-build.sh
+++ b/.github/workflows/scripts/windows-in-container-build.sh
@@ -14,7 +14,7 @@ mkdir -p win32
cd win32
# build Subsurface and then smtk2ssrf
-export MXEBUILDTYPE=i686-w64-mingw32.shared
+export MXEBUILDTYPE=x86_64-w64-mingw32.shared
bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer
# the strange two step move is in order to get predictable names to use
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 22b45809e..9bcc17ba2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -11,7 +11,7 @@ jobs:
buildInContainer:
runs-on: ubuntu-latest
container:
- image: docker://subsurface/mxe-build-container:1.1
+ image: docker://subsurface/mxe-build-container:2.0
steps:
- name: checkout sources