Fix GLES2 discard behaviour (texture transparency)

[dragonfireclient.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d335285d5aeb7ee585d14b2039505de4f6af3461..5b085c36c853e9d7d702f7c4bf24bea3d2baf648 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
   - deploy
 
 variables:
-  IRRLICHT_TAG: "1.9.0mt2"
+  IRRLICHT_TAG: "1.9.0mt3"
   MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
   CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
 
@@ -17,7 +17,7 @@ variables:
   stage: build
   before_script:
    - apt-get update
-   - apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+   - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev
   script:
     - git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt
     - mkdir cmakebuild
@@ -45,6 +45,7 @@ variables:
     - sed -i 's/DATEPLACEHOLDER/'$(date +%y.%m.%d)'/g' build/deb/minetest/DEBIAN/control
     - sed -i 's/JPEG_PLACEHOLDER/'$JPEG_PKG'/g' build/deb/minetest/DEBIAN/control
     - sed -i 's/LEVELDB_PLACEHOLDER/'$LEVELDB_PKG'/g' build/deb/minetest/DEBIAN/control
+    - sed -i 's/JSONCPP_PLACEHOLDER/'$JSONCPP_PKG'/g' build/deb/minetest/DEBIAN/control
     - cd build/deb/ && dpkg-deb -b minetest/ && mv minetest.deb ../../
   artifacts:
     expire_in: 90 day
@@ -54,7 +55,7 @@ variables:
 .debpkg_install:
   stage: deploy
   before_script:
-    - apt-get update
+    - apt-get update -qy
   script:
     - apt-get install -y ./*.deb
     - minetest --version
@@ -75,6 +76,7 @@ package:debian-9:
   needs:
     - build:debian-9
   variables:
+    JSONCPP_PKG: libjsoncpp1
     LEVELDB_PKG: libleveldb1v5
     JPEG_PKG: libjpeg62-turbo
 
@@ -96,6 +98,7 @@ package:debian-10:
   needs:
     - build:debian-10
   variables:
+    JSONCPP_PKG: libjsoncpp1
     LEVELDB_PKG: libleveldb1d
     JPEG_PKG: libjpeg62-turbo
 
@@ -105,30 +108,31 @@ deploy:debian-10:
   needs:
     - package:debian-10
 
-##
-## Ubuntu
-##
-
-# Xenial
+# Bullseye
 
-build:ubuntu-16.04:
-  extends: .build_template
-  image: ubuntu:xenial
+build:debian-11:
+ extends: .build_template
+ image: debian:11
 
-package:ubuntu-16.04:
+package:debian-11:
   extends: .debpkg_template
-  image: ubuntu:xenial
+  image: debian:11
   needs:
-    - build:ubuntu-16.04
+    - build:debian-11
   variables:
-    LEVELDB_PKG: libleveldb1v5
-    JPEG_PKG: libjpeg-turbo8
+    JSONCPP_PKG: libjsoncpp24
+    LEVELDB_PKG: libleveldb1d
+    JPEG_PKG: libjpeg62-turbo
 
-deploy:ubuntu-16.04:
+deploy:debian-11:
   extends: .debpkg_install
-  image: ubuntu:xenial
+  image: debian:11
   needs:
-    - package:ubuntu-16.04
+    - package:debian-11
+
+##
+## Ubuntu
+##
 
 # Bionic
 
@@ -142,6 +146,7 @@ package:ubuntu-18.04:
   needs:
     - build:ubuntu-18.04
   variables:
+    JSONCPP_PKG: libjsoncpp1
     LEVELDB_PKG: libleveldb1v5
     JPEG_PKG: libjpeg-turbo8
 
@@ -151,6 +156,28 @@ deploy:ubuntu-18.04:
   needs:
     - package:ubuntu-18.04
 
+# Focal
+
+build:ubuntu-20.04:
+  extends: .build_template
+  image: ubuntu:focal
+
+package:ubuntu-20.04:
+  extends: .debpkg_template
+  image: ubuntu:focal
+  needs:
+    - build:ubuntu-20.04
+  variables:
+    JSONCPP_PKG: libjsoncpp1
+    LEVELDB_PKG: libleveldb1d
+    JPEG_PKG: libjpeg-turbo8
+
+deploy:ubuntu-20.04:
+  extends: .debpkg_install
+  image: ubuntu:focal
+  needs:
+    - package:ubuntu-20.04
+
 ##
 ## Fedora
 ##
@@ -160,7 +187,7 @@ build:fedora-28:
   extends: .build_template
   image: fedora:28
   before_script:
-    - dnf -y install make git gcc gcc-c++ kernel-devel cmake libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel
+    - dnf -y install make git gcc gcc-c++ kernel-devel cmake libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel libzstd-devel
 
 ##
 ## MinGW for Windows