diff options
| author | sfan5 <sfan5@live.de> | 2022-05-06 14:45:59 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2022-05-06 15:16:04 +0200 |
| commit | 4e1de06782b2541e8d487adfd87b0c2afeedeab3 (patch) | |
| tree | c573d6e16c72cfa0c877e320beb2e72dd2d03807 | |
| parent | 8735a85a3008df39b92b0a6781015011d8935a7b (diff) | |
| download | minetest-4e1de06782b2541e8d487adfd87b0c2afeedeab3.tar.gz minetest-4e1de06782b2541e8d487adfd87b0c2afeedeab3.tar.bz2 minetest-4e1de06782b2541e8d487adfd87b0c2afeedeab3.zip | |
Bump IrrlichtMt to 1.9.0mt5 in CI
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 4 | ||||
| -rwxr-xr-x | util/buildbot/buildwin64.sh | 2 | ||||
| -rw-r--r-- | util/ci/common.sh | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 340f1c604..2cc83923b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -230,7 +230,7 @@ jobs: with: repository: minetest/irrlicht path: lib/irrlichtmt/ - ref: "1.9.0mt4" + ref: "1.9.0mt5" - 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 1f1772bf3..c0278a38c 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,7 +22,7 @@ on: - '.github/workflows/macos.yml' env: - IRRLICHT_TAG: 1.9.0mt4 + IRRLICHT_TAG: 1.9.0mt5 MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git MINETEST_GAME_BRANCH: master MINETEST_GAME_NAME: minetest_game diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81007d7c7..c225bfcd4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: - deploy variables: - IRRLICHT_TAG: "1.9.0mt4" + IRRLICHT_TAG: "1.9.0mt5" MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git" CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index bf5c9a0f2..e0c431711 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -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.0mt4 +irrlicht_version=1.9.0mt5 ogg_version=1.3.5 openal_version=1.21.1 vorbis_version=1.3.7 @@ -83,7 +83,7 @@ download () { # this distinction should be gotten rid of next time cd $libdir -download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32-dw2.zip" irrlicht-$irrlicht_version.zip +download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip" irrlicht-$irrlicht_version.zip download "http://minetest.kitsunemimi.pw/dw2/zlib-$zlib_version-win32.zip" download "http://minetest.kitsunemimi.pw/zstd-$zstd_version-win32.zip" download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip" diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index 30920cf53..e79397be4 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -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.0mt4 +irrlicht_version=1.9.0mt5 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 2802a004a..e372dc682 100644 --- a/util/ci/common.sh +++ b/util/ci/common.sh @@ -11,7 +11,7 @@ install_linux_deps() { shift pkgs+=(libirrlicht-dev) else - wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt4/ubuntu-bionic.tar.gz" + wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt5/ubuntu-bionic.tar.gz" sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local fi |