diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/scripts/windows-container-prep.sh | 8 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 16 |
2 files changed, 10 insertions, 14 deletions
diff --git a/.github/workflows/scripts/windows-container-prep.sh b/.github/workflows/scripts/windows-container-prep.sh new file mode 100644 index 000000000..e6f447d91 --- /dev/null +++ b/.github/workflows/scripts/windows-container-prep.sh @@ -0,0 +1,8 @@ +#!/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 d83b8735a..be38ae37e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,20 +19,8 @@ jobs: - name: get other dependencies run: | - echo "creating the link from /win/subsurface" - cd /win - ln -s /__w/subsurface/subsurface . - ls -l - ls -l subsurface/scripts - echo "installing missing container components" - apt-get install -y ca-certificates libtool - echo "downloading sources for fresh build" - bash subsurface/scripts/get-dep-lib.sh single . libzip - bash subsurface/scripts/get-dep-lib.sh single . hidapi - bash subsurface/scripts/get-dep-lib.sh single . googlemaps - bash subsurface/scripts/get-dep-lib.sh single . grantlee - bash subsurface/scripts/get-dep-lib.sh single . mdbtools - + echo "Running script to install additional dependancies into container" + bash -x subsurface/.github/workflows/scripts/windows-container-prep.sh 2>&1 | tee pre-build.log - name: run build run: | cd /win |