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

build Windows artifact with new container

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

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2023-12-06 13:20:20 -08:00
parent 9cfe656342
commit 2d63591ab8
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/scripts/windows-in-container-build.sh vendored
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# this gets executed inside the container when building a Windows # 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 # working directory is assumed to be the directory including all the
# source directories (subsurface, googlemaps, grantlee, etc) # source directories (subsurface, googlemaps, grantlee, etc)

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

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

1
packaging/windows/mxe-based-build.sh
View file

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

2
scripts/docker/mxe-build-container/Dockerfile
View file

@ -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 # Move the settings into place to build everything that we need
# separate download from build so that we can redo the build # separate download from build so that we can redo the build
ADD settings.mk /win/mxe/settings.mk 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 ; \ RUN cd /win/mxe ; \
make -j 6 download 2>&1 | tee mxe-build.log make -j 6 download 2>&1 | tee mxe-build.log
RUN cd /win/mxe ; \ RUN cd /win/mxe ; \

5
scripts/docker/mxe-build-container/build-container.sh
View file

@ -7,11 +7,12 @@ MXE_SHA="0d21cf2e31d4e6c0"
SCRIPTPATH=$(dirname $0) SCRIPTPATH=$(dirname $0)
# version of the docker image # version of the docker image
VERSION=3.0 VERSION=3.0.1
pushd $SCRIPTPATH pushd $SCRIPTPATH
# we use the 'experimental' --squash argument to significantly reduce the size of the massively huge # we use the 'experimental' --squash argument to significantly reduce the size of the massively huge
# Docker container this produces # 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 popd