aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorGravatar Paul Buxton <paulbuxton.mail@googlemail.com>2020-06-11 08:52:30 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-06-25 11:00:51 -0700
commit68b651e494de6e6049b970ea2fa4228f012c3eca (patch)
treeaaf43b8337cda3381d8b7e8b779e903957358b0d /.github
parenta753845d5acd6d25ff74dc969a9ea6307d8abe6a (diff)
downloadsubsurface-68b651e494de6e6049b970ea2fa4228f012c3eca.tar.gz
build-system/mxe: use the new container image
[Dirk Hohndel: switched back to our docker hub repo] Signed-off-by: Paul Buxton <paulbuxton.mail@googlemail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/scripts/windows-container-prep.sh3
-rw-r--r--.github/workflows/windows.yml4
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/scripts/windows-container-prep.sh b/.github/workflows/scripts/windows-container-prep.sh
index e6f447d91..a71ee381f 100644
--- a/.github/workflows/scripts/windows-container-prep.sh
+++ b/.github/workflows/scripts/windows-container-prep.sh
@@ -1,8 +1,7 @@
#!/bin/bash
# abstract the prepare commands for the windows build into a script that can be reused
# instead of a yaml file
-cd /win
-ln -s /__w/subsurface/subsurface .
+
echo "downloading sources for fresh build"
bash subsurface/scripts/get-dep-lib.sh single . libzip
bash subsurface/scripts/get-dep-lib.sh single . googlemaps
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index be38ae37e..22b45809e 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.0
+ image: docker://subsurface/mxe-build-container:1.1
steps:
- name: checkout sources
@@ -20,6 +20,8 @@ jobs:
- name: get other dependencies
run: |
echo "Running script to install additional dependancies into container"
+ cd /win
+ ln -s /__w/subsurface/subsurface .
bash -x subsurface/.github/workflows/scripts/windows-container-prep.sh 2>&1 | tee pre-build.log
- name: run build
run: |