From 1a9b09682ad4bb99a4526734c5b8041f884d47af Mon Sep 17 00:00:00 2001 From: Michael Keller Date: Wed, 23 Oct 2024 18:49:31 +1300 Subject: [PATCH] Windows: Switch to Build on ubuntu 24.04 Switch the Windows build to run on ubuntu 24.04, and also update to use the latest version of MXE. Signed-off-by: Michael Keller --- .github/workflows/windows.yml | 2 +- packaging/windows/docker-build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e96ac186b..06b17dc1d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,7 +16,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: docker://subsurface/mxe-build:3.2.0 + image: docker://subsurface/mxe-build:3.3.0 steps: - name: checkout sources diff --git a/packaging/windows/docker-build.sh b/packaging/windows/docker-build.sh index 5cca646c2..3a3093a99 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.2.0 sleep infinity + docker create -v ${SUBSURFACE_ROOT}:${CONTAINER_SUBSURFACE_DIR} --name=${CONTAINER_NAME} subsurface/mxe-build:3.3.0 sleep infinity fi # Start the container