From 6737e8b678333b04eaea13ad1b514771221db560 Mon Sep 17 00:00:00 2001 From: "Randolph W. Aarseth II" Date: Thu, 24 Oct 2024 17:56:33 -0700 Subject: [PATCH] asd --- .github/workflows/linux-build.yaml | 4 ++-- images/linux.Dockerfile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-build.yaml b/.github/workflows/linux-build.yaml index fbb95aa..0105e5f 100644 --- a/.github/workflows/linux-build.yaml +++ b/.github/workflows/linux-build.yaml @@ -85,10 +85,10 @@ jobs: - name: Build for ${{ steps.naming.outputs.STEP_NAME }} Editor run: | if [ "$MONO" -eq 1 ]; then - scons platform=$PLATFORM arch=${{ matrix.type }} production=yes module_mono_enabled=yes target=editor use_llvm=yes linker=mold builtin_embree=no builtin_enet=no builtin_freetype=no builtin_graphite=no builtin_harfbuzz=no builtin_libogg=no builtin_libpng=no builtin_libtheora=no builtin_libvorbis=no builtin_libwebp=no builtin_mbedtls=no builtin_miniupnpc=no builtin_pcre2=no builtin_zlib=no builtin_zstd=no + scons platform=$PLATFORM arch=${{ matrix.type }} production=yes module_mono_enabled=yes target=editor use_llvm=yes linker=mold # builtin_embree=no builtin_enet=no builtin_freetype=no builtin_graphite=no builtin_harfbuzz=no builtin_libogg=no builtin_libpng=no builtin_libtheora=no builtin_libvorbis=no builtin_libwebp=no builtin_mbedtls=no builtin_miniupnpc=no builtin_pcre2=no builtin_zlib=no builtin_zstd=no ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=$PLATFORM else - scons platform=$PLATFORM arch=${{ matrix.type }} production=yes target=editor use_llvm=yes linker=mold builtin_embree=no builtin_enet=no builtin_freetype=no builtin_graphite=no builtin_harfbuzz=no builtin_libogg=no builtin_libpng=no builtin_libtheora=no builtin_libvorbis=no builtin_libwebp=no builtin_mbedtls=no builtin_miniupnpc=no builtin_pcre2=no builtin_zlib=no builtin_zstd=no + scons platform=$PLATFORM arch=${{ matrix.type }} production=yes target=editor use_llvm=yes linker=mold # builtin_embree=no builtin_enet=no builtin_freetype=no builtin_graphite=no builtin_harfbuzz=no builtin_libogg=no builtin_libpng=no builtin_libtheora=no builtin_libvorbis=no builtin_libwebp=no builtin_mbedtls=no builtin_miniupnpc=no builtin_pcre2=no builtin_zlib=no builtin_zstd=no fi - uses: actions/upload-artifact@v3 diff --git a/images/linux.Dockerfile b/images/linux.Dockerfile index 6152bc2..f8b074d 100644 --- a/images/linux.Dockerfile +++ b/images/linux.Dockerfile @@ -63,6 +63,7 @@ RUN dnf downgrade libstdc++ libstdc++-devel -y RUN dnf install -y \ gcc-c++.i686 \ glibc-devel.i686 \ + glslang-devel.i686 \ libstdc++-13.2.1-3.fc39.i686 \ libstdc++-devel-13.2.1-3.fc39.i686 \ --allowerasing