diff --git a/.github/workflows/windows-mxe-dockerimage.yml b/.github/workflows/windows-mxe-dockerimage.yml index a0478d1c5..5b5c05616 100644 --- a/.github/workflows/windows-mxe-dockerimage.yml +++ b/.github/workflows/windows-mxe-dockerimage.yml @@ -12,8 +12,8 @@ jobs: windows-mxe: runs-on: ubuntu-latest env: - VERSION: ${{ '3.1.0' }} # 'official' images should have a dot-zero version - mxe_sha: 'c0bfefc57a00fdf6cb5278263e21a478e47b0bf5' + VERSION: ${{ '3.2.0' }} # 'official' images should have a dot-zero version + mxe_sha: '974808c2ecb02866764d236fe533ae57ba342e7a' steps: - uses: actions/checkout@v4 diff --git a/packaging/windows/docker-build.sh b/packaging/windows/docker-build.sh index 003d6c48c..5cca646c2 100755 --- a/packaging/windows/docker-build.sh +++ b/packaging/windows/docker-build.sh @@ -34,7 +34,7 @@ if [[ -z "${CONTAINER_ID}" ]]; then croak "Please make sure GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL are set for the first run of this script." fi - docker create -v ${SUBSURFACE_ROOT}:${CONTAINER_SUBSURFACE_DIR} --name=${CONTAINER_NAME} subsurface/mxe-build:3.1.0 sleep infinity + docker create -v ${SUBSURFACE_ROOT}:${CONTAINER_SUBSURFACE_DIR} --name=${CONTAINER_NAME} subsurface/mxe-build:3.2.0 sleep infinity fi # Start the container diff --git a/scripts/docker/mxe-build-container/build-container.sh b/scripts/docker/mxe-build-container/build-container.sh deleted file mode 100755 index 617fcd1b0..000000000 --- a/scripts/docker/mxe-build-container/build-container.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -x -set -e - -# known good MXE sha -MXE_SHA="c0bfefc57a00fdf6cb5278263e21a478e47b0bf5" -SCRIPTPATH=$(dirname $0) - -# version of the docker image -VERSION=3.1.0 - -pushd $SCRIPTPATH - -# we use the 'experimental' --squash argument to significantly reduce the size of the massively huge -# Docker container this produces -docker build -t subsurface/mxe-build:$VERSION --build-arg=mxe_sha=$MXE_SHA -f Dockerfile . -docker images -popd diff --git a/scripts/docker/mxe-build-container/settings.mk b/scripts/docker/mxe-build-container/settings.mk index 995b3e4c0..56d4835ee 100644 --- a/scripts/docker/mxe-build-container/settings.mk +++ b/scripts/docker/mxe-build-container/settings.mk @@ -30,6 +30,7 @@ LOCAL_PKG_LIST := gcc \ libgit2 \ libftdi1 \ mdbtools \ + libraw \ qtconnectivity \ qtdeclarative \ qtimageformats \