From 3362ca25be5c44096feab2b7239be3a25dfe7d40 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Thu, 13 Mar 2025 23:22:58 -0500 Subject: [PATCH] GHActions:MacOS: Don't use cmake --parallel without specifying job count That ends up allowing infinite jobs on the makefile backend for some reason --- .../scripts/macos/build-dependencies.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/scripts/macos/build-dependencies.sh b/.github/workflows/scripts/macos/build-dependencies.sh index bbc13603c5..eed8bebe3b 100755 --- a/.github/workflows/scripts/macos/build-dependencies.sh +++ b/.github/workflows/scripts/macos/build-dependencies.sh @@ -183,8 +183,8 @@ rm -fr "freetype-$FREETYPE" tar xf "freetype-$FREETYPE.tar.xz" cd "freetype-$FREETYPE" cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -cmake --build build --parallel -cmake --install build +make -C build "-j$NPROCS" +make -C build install cd .. echo "Building HarfBuzz..." @@ -192,8 +192,8 @@ rm -fr "harfbuzz-$HARFBUZZ" tar xf "harfbuzz-$HARFBUZZ.tar.gz" cd "harfbuzz-$HARFBUZZ" cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build -cmake --build build --parallel -cmake --install build +make -C build "-j$NPROCS" +make -C build install cd .. echo "Building FreeType with HarfBuzz..." @@ -201,8 +201,8 @@ rm -fr "freetype-$FREETYPE" tar xf "freetype-$FREETYPE.tar.xz" cd "freetype-$FREETYPE" cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -cmake --build build --parallel -cmake --install build +make -C build "-j$NPROCS" +make -C build install cd .. # MoltenVK already builds universal binaries, nothing special to do here. @@ -333,8 +333,8 @@ tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" cd "KDDockWidgets-$KDDOCKWIDGETS" patch -p1 < "$SCRIPTDIR/../common/kddockwidgets-dodgy-include.patch" cmake "${CMAKE_COMMON[@]}" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build -cmake --build build --parallel -cmake --install build +make -C build "-j$NPROCS" +make -C build install cd .. echo "Cleaning up..."