Update Dockerfiles to restrict Meson version to <1.8.0 to avoid upstream bugs with subprojects and wraps.

Author: ProjectSynchro

CHANGELOG.md

@@ -7,6 +7,9 @@
 - `naev-artwork` (Used to render naev artwork.) ***DEPRECATED***
 - `naev-linux-archaic` (Used for old release builds) ***DEPRECATED***
 
+### v1.12.10
+- Update Dockerfiles to restrict Meson version to <1.8.0 to avoid upstream bugs with subprojects and wraps
+
 ### v1.12.9
 - Install git version of bindgen when running setup-devenv.sh
    - This fixes build issues on non Linux platforms.

naev-docs/Dockerfile

@@ -10,15 +10,20 @@ ENV IMAGE_NAME "naev-docs"
 COPY setup-devenv.sh /usr/bin
 
 # Install utilities
-RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install make python3-pip meson ninja-build clang gawk gcc git GraphicsMagick gzip llvm libyaml openssl optipng rustup zlib \
+RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install make python3-pip ninja-build clang gawk gcc git GraphicsMagick gzip llvm libyaml openssl optipng rustup zlib \
     python3-pyyaml rsync tidy tar unzip xz zip \
 # Install ldoc
     lua-ldoc \
 # Install LaTeX packages
     latexmk texlive-luahbtex texlive-roboto texlive-preprint texlive-parskip texlive-sfmath \
     texlive-markdown texlive-csvsimple texlive-gobble texlive-microtype texlive-minted texlive-newunicodechar && \
     microdnf clean all && \
-# Verify tool versions and install locations.
+# Need Meson >=1.7.0 for rust_std=2024, but restrict to versions below 1.8.0.
+    python3 -m pip install 'meson>=1.7.0,<1.8.0' --upgrade && \
+# Verify tool versions and installation locations.
+    echo "Verifying meson install" && \
+    command -v meson && \
+    meson --version && \
     echo "Verifying latexmk install" && \
     command -v latexmk && \
     latexmk -v && \

naev-macos/Dockerfile

@@ -100,11 +100,11 @@ ENV OSXCROSS_MP_INC "1"
 ENV APPIMAGE_EXTRACT_AND_RUN 1
 
 # Install build tools.
-RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang-devel cmake gettext genisoimage gawk git gzip lld meson ninja-build python3-pip python3-pyyaml rustup unzip tar texinfo xz zlib zip && \
+RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang-devel cmake gettext genisoimage gawk git gzip lld ninja-build python3-pip python3-pyyaml rustup unzip tar texinfo xz zlib zip && \
     microdnf clean all && \
-# Need Meson >=1.7.0 for rust_std=2024, which is obviously not up-to-date in steamOS
-    python3 -m pip install meson --upgrade && \
-# Verify tool version.
+# Need Meson >=1.7.0 for rust_std=2024, but restrict to versions below 1.8.0.
+    python3 -m pip install 'meson>=1.7.0,<1.8.0' --upgrade && \
+# Verify tool versions and installation locations.
     echo "Verifying meson install" && \
     command -v meson && \
     meson --version && \

naev-release/Dockerfile

@@ -23,7 +23,7 @@ WORKDIR /tmp
 # Install utilities
 RUN curl -L -O https://cli.github.com/packages/rpm/gh-cli.repo --output-dir /etc/yum.repos.d && \
     microdnf update -y && \
-    microdnf --nodocs --setopt=install_weak_deps=0 -y install gh python3-pip meson ninja-build clang gawk gcc gzip python3-pyyaml file git readline-devel rustup tar xz unzip zip \
+    microdnf --nodocs --setopt=install_weak_deps=0 -y install gh python3-pip ninja-build clang gawk gcc gzip python3-pyyaml file git readline-devel rustup tar xz unzip zip \
 # Install SteamCMD and friends
     glibc.i686 sdl2-compat.i686 && \
     microdnf clean all && \
@@ -45,7 +45,12 @@ RUN curl -L -O https://cli.github.com/packages/rpm/gh-cli.repo --output-dir /etc
     mkdir -p /opt/apple-codesign && \
     tar --strip-components=1 -xvzf apple-codesign-0.29.0-x86_64-unknown-linux-musl.tar.gz -C /opt/apple-codesign && \
     rm apple-codesign-0.29.0-x86_64-unknown-linux-musl.tar.gz && \
+# Need Meson >=1.7.0 for rust_std=2024, but restrict to versions below 1.8.0.
+    python3 -m pip install 'meson>=1.7.0,<1.8.0' --upgrade && \
 # Verify tool versions and installation locations.
+    echo "Verifying meson install" && \
+    command -v meson && \
+    meson --version && \
     echo "Verifying steamcmd install" && \
     command -v steamcmd && \
     steamcmd +quit && \

naev-windows/Dockerfile

@@ -14,7 +14,7 @@ COPY _copr:copr.fedorainfracloud.org:jackgreiner:mingw64-packages.repo /etc/yum.
 COPY setup-devenv.sh /usr/bin
 
 RUN microdnf update -y && \
-    microdnf --nodocs --setopt=install_weak_deps=0 -y install clang gawk gcc gettext git gzip lld llvm python3-pip meson ninja-build python3-pyyaml rustup tar texinfo xz unzip zip \
+    microdnf --nodocs --setopt=install_weak_deps=0 -y install clang gawk gcc gettext git gzip lld llvm python3-pip ninja-build python3-pyyaml rustup tar texinfo xz unzip zip \
 # OK, seems like the rust is a bit a of mess as it is trying to compile some things internally with hardcoded mingw64 paths
 # We have to toss the dependencies here so that it works. In particular, mlua-sys seems to want to build luajit
     mingw64-binutils mingw64-gcc \
@@ -28,8 +28,13 @@ RUN microdnf update -y && \
 # Install openblas for mingw (building this from source is an option but probably painful)
     curl -L -O https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.29/OpenBLAS-0.3.29_x64_64.zip  && \
     unzip OpenBLAS-0.3.29_x64_64.zip -d /usr/x86_64-w64-mingw32/sys-root/mingw && \
-    rm -rf OpenBLAS-0.3.29_x64_64.zip
-
+    rm -rf OpenBLAS-0.3.29_x64_64.zip && \
+# Need Meson >=1.7.0 for rust_std=2024, but restrict to versions below 1.8.0.
+    python3 -m pip install 'meson>=1.7.0,<1.8.0' --upgrade && \
+# Verify tool versions and installation locations.
+    echo "Verifying meson install" && \
+    command -v meson && \
+    meson --version
 # Force appimages to run in extract mode since FUSE is not available
 ENV APPIMAGE_EXTRACT_AND_RUN 1