Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / util / ci / common.sh

diff --git a/util/ci/common.sh b/util/ci/common.sh
index 6a28482fd6a3e999c672cc8484a510ab2915e49d..16327ec308fd75b1b4dfcf1a230611240bbc6ba3 100644 (file)
--- a/util/ci/common.sh
+++ b/util/ci/common.sh
@@ -5,23 +5,20 @@ install_linux_deps() {
        local pkgs=(cmake libpng-dev \
                libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
                libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
-               gettext libpq-dev libleveldb-dev libcurl4-openssl-dev)
+               gettext libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev)
 
-       if [[ "$1" == "--old-irr" ]]; then
+       if [[ "$1" == "--no-irr" ]]; then
+               shift
+       elif [[ "$1" == "--old-irr" ]]; then
                shift
                pkgs+=(libirrlicht-dev)
        else
-               # TODO: return old URL when IrrlichtMt 1.9.0mt2 is tagged
-               #wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt1/ubuntu-bionic.tar.gz"
-               wget "http://minetest.kitsunemimi.pw/irrlichtmt-patched-temporary.tgz" -O ubuntu-bionic.tar.gz
+               wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt6/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