From 19fd65f9cd1308c7ef9c6024c05856b20fd608ed Mon Sep 17 00:00:00 2001 From: Olof Pettersson Date: Tue, 2 Dec 2025 11:00:10 +0100 Subject: [PATCH] Try installing wget --- Dockerfile.windows | 11 ++++++----- build-windows.sh | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Dockerfile.windows b/Dockerfile.windows index e573d5d..cea3e9b 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -4,15 +4,16 @@ FROM godot-fedora:${img_version} RUN dnf -y install --setopt=install_weak_deps=False \ mingw32-gcc mingw32-gcc-c++ mingw32-winpthreads-static mingw64-gcc mingw64-gcc-c++ mingw64-winpthreads-static -ENV LLVM_MINGW_VERSION=20250528 -ENV LLVM_MINGW_NAME=llvm-mingw-${LLVM_MINGW_VERSION}-ucrt-ubuntu-22.04-x86_64 - -# We copy the pre-downloaded file from the runner context into the image -COPY ${LLVM_MINGW_NAME}.tar.xz . +ENV LLVM_MINGW_NAME=llvm-mingw-20250528-ucrt-ubuntu-22.04-x86_64 +# Use a wildcard so we don't have to worry about variable expansion issues in COPY +COPY llvm-mingw-*.tar.xz . +# Extract and Install RUN tar xf ${LLVM_MINGW_NAME}.tar.xz && \ rm -f ${LLVM_MINGW_NAME}.tar.xz && \ mv ${LLVM_MINGW_NAME} /root/llvm-mingw +ENV PATH="/root/llvm-mingw/bin:${PATH}" + CMD /bin/bash \ No newline at end of file diff --git a/build-windows.sh b/build-windows.sh index dcd29e9..edeceb0 100644 --- a/build-windows.sh +++ b/build-windows.sh @@ -33,7 +33,11 @@ LLVM_NAME="llvm-mingw-${LLVM_VER}-ucrt-ubuntu-22.04-x86_64" TARBALL="${LLVM_NAME}.tar.xz" DOWNLOAD_URL="https://github.com/mstorsjo/llvm-mingw/releases/download/${LLVM_VER}/${TARBALL}" -# ... (Login steps remain the same) ... +# Check if wget is missing and install it +if ! command -v wget &> /dev/null; then + echo "wget not found. Installing..." + dnf install -y wget +fi echo "---------------------------------------" echo "Pre-downloading LLVM Toolchain..."