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 d73c31b2fd2503b4b03cee5e71544b0be340d6e2..16327ec308fd75b1b4dfcf1a230611240bbc6ba3 100644 (file)
--- a/util/ci/common.sh
+++ b/util/ci/common.sh
@@ -5,14 +5,15 @@ 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 postgresql-server-dev-all 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
-               wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt0/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