mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system/mxe: use the new container image

Browse source 
[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>
This commit is contained in:
Paul Buxton 2020-06-11 08:52:30 +01:00 committed by Dirk Hohndel
parent a753845d5a
commit 68b651e494
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/scripts/windows-container-prep.sh vendored
View file

@ -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

4
.github/workflows/windows.yml vendored
View file

@ -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: |