Try installing wget
Some checks failed
Publish Builder Images / build-base (push) Successful in 30s
Publish Builder Images / build-windows (push) Has been cancelled

This commit is contained in:
2025-12-02 11:00:10 +01:00
parent 4e2d4d0e91
commit 19fd65f9cd
2 changed files with 11 additions and 6 deletions

View File

@ -4,15 +4,16 @@ FROM godot-fedora:${img_version}
RUN dnf -y install --setopt=install_weak_deps=False \ 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 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-20250528-ucrt-ubuntu-22.04-x86_64
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 .
# 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 && \ RUN tar xf ${LLVM_MINGW_NAME}.tar.xz && \
rm -f ${LLVM_MINGW_NAME}.tar.xz && \ rm -f ${LLVM_MINGW_NAME}.tar.xz && \
mv ${LLVM_MINGW_NAME} /root/llvm-mingw mv ${LLVM_MINGW_NAME} /root/llvm-mingw
ENV PATH="/root/llvm-mingw/bin:${PATH}"
CMD /bin/bash CMD /bin/bash

View File

@ -33,7 +33,11 @@ LLVM_NAME="llvm-mingw-${LLVM_VER}-ucrt-ubuntu-22.04-x86_64"
TARBALL="${LLVM_NAME}.tar.xz" TARBALL="${LLVM_NAME}.tar.xz"
DOWNLOAD_URL="https://github.com/mstorsjo/llvm-mingw/releases/download/${LLVM_VER}/${TARBALL}" 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 "---------------------------------------"
echo "Pre-downloading LLVM Toolchain..." echo "Pre-downloading LLVM Toolchain..."