CICD: Add libraw to the MXE build container.

In support of #3954.

Also update MXE to the latest version.

Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2024-09-13 01:36:41 +12:00
parent a2f5be13e3
commit cb6766c1d4
4 changed files with 4 additions and 21 deletions

View file

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

View file

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

View file

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

View file

@ -30,6 +30,7 @@ LOCAL_PKG_LIST := gcc \
libgit2 \
libftdi1 \
mdbtools \
libraw \
qtconnectivity \
qtdeclarative \
qtimageformats \