diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04ae73e725..68beb806fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -116,7 +116,7 @@ jobs: - name: Setup CMake run: | - curl -L https://github.com/Kitware/CMake/releases/download/v3.29.0-rc2/cmake-3.29.0-rc2-windows-i386.zip -o cmake.zip + curl -L https://github.com/Kitware/CMake/releases/download/v3.29.3/cmake-3.29.3-windows-i386.zip -o cmake.zip unzip cmake.zip - name: Setup JDK @@ -244,6 +244,7 @@ jobs: run: | mkdir build cd build + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) cmake \ -DCMAKE_C_COMPILER=/usr/bin/clang \ -DCMAKE_CXX_COMPILER=/usr/bin/clang++ \ @@ -265,18 +266,20 @@ jobs: - name: Compile run: | cd build + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) make -j$(sysctl -n hw.logicalcpu) - name: Test run: | cd build + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) make test cmake -E remove_directory "/Users/runner/work/UltimMC/build/dist" - name: Install run: | - brew remove --ignore-dependencies -f glib zstd pcre2 glib gettext jpeg-turbo freetype libpng cd build + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) make install chmod +x /Users/runner/work/UltimMC/build/dist/UltimMC.app/Contents/MacOS/UltimMC