mirror of
https://github.com/minetest/minetest.git
synced 2024-11-30 03:23:45 +01:00
Bump IrrlichtMt to 1.9.0mt5 in CI
This commit is contained in:
parent
8735a85a30
commit
4e1de06782
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -230,7 +230,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
repository: minetest/irrlicht
|
repository: minetest/irrlicht
|
||||||
path: lib/irrlichtmt/
|
path: lib/irrlichtmt/
|
||||||
ref: "1.9.0mt4"
|
ref: "1.9.0mt5"
|
||||||
|
|
||||||
- name: Restore from cache and run vcpkg
|
- name: Restore from cache and run vcpkg
|
||||||
uses: lukka/run-vcpkg@v7
|
uses: lukka/run-vcpkg@v7
|
||||||
|
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@ -22,7 +22,7 @@ on:
|
|||||||
- '.github/workflows/macos.yml'
|
- '.github/workflows/macos.yml'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
IRRLICHT_TAG: 1.9.0mt4
|
IRRLICHT_TAG: 1.9.0mt5
|
||||||
MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git
|
MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git
|
||||||
MINETEST_GAME_BRANCH: master
|
MINETEST_GAME_BRANCH: master
|
||||||
MINETEST_GAME_NAME: minetest_game
|
MINETEST_GAME_NAME: minetest_game
|
||||||
|
@ -9,7 +9,7 @@ stages:
|
|||||||
- deploy
|
- deploy
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
IRRLICHT_TAG: "1.9.0mt4"
|
IRRLICHT_TAG: "1.9.0mt5"
|
||||||
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
|
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
|
||||||
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
|
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ done
|
|||||||
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
|
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
|
||||||
|
|
||||||
# Get stuff
|
# Get stuff
|
||||||
irrlicht_version=1.9.0mt4
|
irrlicht_version=1.9.0mt5
|
||||||
ogg_version=1.3.5
|
ogg_version=1.3.5
|
||||||
openal_version=1.21.1
|
openal_version=1.21.1
|
||||||
vorbis_version=1.3.7
|
vorbis_version=1.3.7
|
||||||
@ -83,7 +83,7 @@ download () {
|
|||||||
# this distinction should be gotten rid of next time
|
# this distinction should be gotten rid of next time
|
||||||
|
|
||||||
cd $libdir
|
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/dw2/zlib-$zlib_version-win32.zip"
|
||||||
download "http://minetest.kitsunemimi.pw/zstd-$zstd_version-win32.zip"
|
download "http://minetest.kitsunemimi.pw/zstd-$zstd_version-win32.zip"
|
||||||
download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip"
|
download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip"
|
||||||
|
@ -45,7 +45,7 @@ done
|
|||||||
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
|
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
|
||||||
|
|
||||||
# Get stuff
|
# Get stuff
|
||||||
irrlicht_version=1.9.0mt4
|
irrlicht_version=1.9.0mt5
|
||||||
ogg_version=1.3.5
|
ogg_version=1.3.5
|
||||||
openal_version=1.21.1
|
openal_version=1.21.1
|
||||||
vorbis_version=1.3.7
|
vorbis_version=1.3.7
|
||||||
|
@ -11,7 +11,7 @@ install_linux_deps() {
|
|||||||
shift
|
shift
|
||||||
pkgs+=(libirrlicht-dev)
|
pkgs+=(libirrlicht-dev)
|
||||||
else
|
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
|
sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user