diff --git a/.dockerignore b/.dockerignore index bda43ebc0..e40333cab 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,6 @@ +./util/autotest/logs.* +./build_* + ./cmake-build-* ./build/* ./cache/* diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 736cd4287..a4574d7ad 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -41,7 +41,7 @@ jobs: - name: Build run: | git clone -b $MINETEST_GAME_BRANCH $MINETEST_GAME_REPO games/$MINETEST_GAME_NAME - git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt) +# git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt) mkdir build cd build cmake .. \ diff --git a/util/ci/build.sh b/util/ci/build.sh index 88349b852..df295e2bf 100755 --- a/util/ci/build.sh +++ b/util/ci/build.sh @@ -1,6 +1,7 @@ #! /bin/bash -e cmake -B build \ + -DNO_BIN_DIR=1 \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Debug} \ -DRUN_IN_PLACE=TRUE \ -DENABLE_GETTEXT=${CMAKE_ENABLE_GETTEXT:-TRUE} \