diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-09-19 20:56:13 +0200 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-09-19 20:56:13 +0200 |
| commit | c8900e169a1ddceec07a449f1ae7c4322ff02036 (patch) | |
| tree | 5156605fb473d25786426eb6876ba2e7d3b7507b /util/ci | |
| parent | 950d2c9b3e10cbace9236e820c8119d1abb9e01f (diff) | |
| parent | e0529da5c84f224c380e6d5e063392cb01f85683 (diff) | |
| download | dragonfireclient-c8900e169a1ddceec07a449f1ae7c4322ff02036.tar.xz | |
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'util/ci')
| -rw-r--r-- | util/ci/clang-format-whitelist.txt | 2 | ||||
| -rw-r--r-- | util/ci/common.sh | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/util/ci/clang-format-whitelist.txt b/util/ci/clang-format-whitelist.txt index 75d99f4cd..5cbc262ef 100644 --- a/util/ci/clang-format-whitelist.txt +++ b/util/ci/clang-format-whitelist.txt @@ -192,8 +192,6 @@ src/gui/guiTable.cpp src/gui/guiTable.h src/gui/guiVolumeChange.cpp src/gui/guiVolumeChange.h -src/gui/intlGUIEditBox.cpp -src/gui/intlGUIEditBox.h src/gui/mainmenumanager.h src/gui/modalMenu.h src/guiscalingfilter.cpp diff --git a/util/ci/common.sh b/util/ci/common.sh index eb282c823..88bed9ed4 100644 --- a/util/ci/common.sh +++ b/util/ci/common.sh @@ -5,20 +5,21 @@ 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 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.0mt3/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 |