Merge branch 'add_libraw_to_mxe_container' into origin_master

mikeller · Sep 13, 2024 · 6ce7bc5 · 6ce7bc5
2 parents 523ba03 + e4a1123
commit 6ce7bc5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git 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
@@ -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