diff options
| -rw-r--r-- | .github/workflows/build.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | misc/irrlichtmt_tag.txt | 1 | ||||
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 6 | ||||
| -rwxr-xr-x | util/buildbot/buildwin64.sh | 6 | ||||
| -rw-r--r-- | util/ci/common.sh | 3 |
7 files changed, 14 insertions, 17 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c45743284..d578c3d9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -226,11 +226,9 @@ jobs: - uses: actions/checkout@v3 - name: Checkout IrrlichtMt - uses: actions/checkout@v3 - with: - repository: minetest/irrlicht - path: lib/irrlichtmt/ - ref: "1.9.0mt7" + run: | + $ref = @(Get-Content misc\irrlichtmt_tag.txt) + git clone https://github.com/minetest/irrlicht lib\irrlichtmt --depth 1 -b $ref[0] - name: Restore from cache and run vcpkg uses: lukka/run-vcpkg@v7 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7f0318c76..038765494 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,7 +22,6 @@ on: - '.github/workflows/macos.yml' env: - IRRLICHT_TAG: 1.9.0mt7 MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git MINETEST_GAME_BRANCH: master MINETEST_GAME_NAME: minetest_game @@ -43,8 +42,7 @@ jobs: - name: Build run: | git clone -b $MINETEST_GAME_BRANCH $MINETEST_GAME_REPO games/$MINETEST_GAME_NAME - rm -rvf games/$MINETEST_GAME_NAME/.git - git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt + 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/.gitlab-ci.yml b/.gitlab-ci.yml index a24ae45b0..28e35a971 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,6 @@ stages: - deploy variables: - IRRLICHT_TAG: "1.9.0mt7" MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git" CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH @@ -19,7 +18,7 @@ variables: - apt-get update - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev script: - - git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt + - git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt) - mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE .. - make -j $(($(nproc) + 1)) diff --git a/misc/irrlichtmt_tag.txt b/misc/irrlichtmt_tag.txt new file mode 100644 index 000000000..2684ddfde --- /dev/null +++ b/misc/irrlichtmt_tag.txt @@ -0,0 +1 @@ +1.9.0mt7 diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index e54c1af4d..3df48f178 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -8,7 +8,7 @@ GAME_GIT=https://github.com/minetest/minetest_game GAME_BRANCH=master GAME_NAME=minetest_game -dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ $# -ne 1 ]; then echo "Usage: $0 <build directory>" exit 1 @@ -28,7 +28,7 @@ if [ -z "$compiler" ]; then echo "Unable to determine which MinGW compiler to use" exit 1 fi -toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake +toolchain_file=$topdir/toolchain_${compiler/-gcc/}.cmake echo "Using $toolchain_file" # Try to find runtime DLLs in various paths (varies by distribution, sigh) @@ -45,7 +45,7 @@ done echo "The compiler runtime DLLs could not be found, they might be missing in the final package." # Get stuff -irrlicht_version=1.9.0mt7 +irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt) ogg_version=1.3.5 openal_version=1.21.1 vorbis_version=1.3.7 diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index af6b5b350..9d222ab42 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -8,7 +8,7 @@ GAME_GIT=https://github.com/minetest/minetest_game GAME_BRANCH=master GAME_NAME=minetest_game -dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ $# -ne 1 ]; then echo "Usage: $0 <build directory>" exit 1 @@ -28,7 +28,7 @@ if [ -z "$compiler" ]; then echo "Unable to determine which MinGW compiler to use" exit 1 fi -toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake +toolchain_file=$topdir/toolchain_${compiler/-gcc/}.cmake echo "Using $toolchain_file" # Try to find runtime DLLs in various paths (varies by distribution, sigh) @@ -45,7 +45,7 @@ done echo "The compiler runtime DLLs could not be found, they might be missing in the final package." # Get stuff -irrlicht_version=1.9.0mt7 +irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt) ogg_version=1.3.5 openal_version=1.21.1 vorbis_version=1.3.7 diff --git a/util/ci/common.sh b/util/ci/common.sh index db525a61c..3015680c4 100644 --- a/util/ci/common.sh +++ b/util/ci/common.sh @@ -10,7 +10,8 @@ install_linux_deps() { if [[ "$1" == "--no-irr" ]]; then shift else - wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt7/ubuntu-bionic.tar.gz" + local ver=$(cat misc/irrlichtmt_tag.txt) + wget "https://github.com/minetest/irrlicht/releases/download/$ver/ubuntu-bionic.tar.gz" sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local fi |