aboutsummaryrefslogtreecommitdiff
path: root/util/ci/common.sh
diff options
context:
space:
mode:
Diffstat (limited to 'util/ci/common.sh')
-rw-r--r--util/ci/common.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/util/ci/common.sh b/util/ci/common.sh
index f9df54c4a..3015680c4 100644
--- a/util/ci/common.sh
+++ b/util/ci/common.sh
@@ -7,19 +7,16 @@ install_linux_deps() {
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
gettext libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev)
- if [[ "$1" == "--old-irr" ]]; then
+ if [[ "$1" == "--no-irr" ]]; then
shift
- pkgs+=(libirrlicht-dev)
else
- wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt4/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
sudo apt-get update
sudo apt-get install -y --no-install-recommends ${pkgs[@]} "$@"
-
- # workaround for bug with Github Actions' ubuntu-18.04 image
- sudo apt-get remove -y libgcc-11-dev gcc-11 || :
}
# Mac OSX build only