Add debian 11 to Gitlab-CI (#11571)

* feat(gitlab-ci): add debian 11 support

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d335285d5aeb7ee585d14b2039505de4f6af3461..a99159934a371cc98e013cb9bc1fa69b6b9744f7 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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,6 +108,28 @@ deploy:debian-10:
   needs:
     - package:debian-10
 
+# Bullseye
+
+build:debian-11:
+ extends: .build_template
+ image: debian:11
+
+package:debian-11:
+  extends: .debpkg_template
+  image: debian:11
+  needs:
+    - build:debian-11
+  variables:
+    JSONCPP_PKG: libjsoncpp24
+    LEVELDB_PKG: libleveldb1d
+    JPEG_PKG: libjpeg62-turbo
+
+deploy:debian-11:
+  extends: .debpkg_install
+  image: debian:11
+  needs:
+    - package:debian-11
+
 ##
 ## Ubuntu
 ##
@@ -121,6 +146,7 @@ package:ubuntu-16.04:
   needs:
     - build:ubuntu-16.04
   variables:
+    JSONCPP_PKG: libjsoncpp1
     LEVELDB_PKG: libleveldb1v5
     JPEG_PKG: libjpeg-turbo8
 
@@ -142,6 +168,7 @@ package:ubuntu-18.04:
   needs:
     - build:ubuntu-18.04
   variables:
+    JSONCPP_PKG: libjsoncpp1
     LEVELDB_PKG: libleveldb1v5
     JPEG_PKG: libjpeg-turbo8
 

diff --git a/misc/debpkg-control b/misc/debpkg-control
index 1fef17fd9319a058ad9f62023125c19da7df14af..7c0134bb0c079529ea18af6ccab76ac9ad1e9d29 100644 (file)
--- a/misc/debpkg-control
+++ b/misc/debpkg-control
@@ -3,7 +3,7 @@ Priority: extra
 Standards-Version: 3.6.2
 Package: minetest-staging
 Version: 5.4.0-DATEPLACEHOLDER
-Depends: libc6, libcurl3-gnutls, libfreetype6, libgl1, JPEG_PLACEHOLDER, libjsoncpp1, LEVELDB_PLACEHOLDER, libopenal1, libpng16-16, libsqlite3-0, libstdc++6, libvorbisfile3, libx11-6, libxxf86vm1, zlib1g
+Depends: libc6, libcurl3-gnutls, libfreetype6, libgl1, JPEG_PLACEHOLDER, JSONCPP_PLACEHOLDER, LEVELDB_PLACEHOLDER, libopenal1, libpng16-16, libsqlite3-0, libstdc++6, libvorbisfile3, libx11-6, libxxf86vm1, zlib1g
 Maintainer: Loic Blot <loic.blot@unix-experience.fr>
 Homepage: https://www.minetest.net/
 Vcs-Git: https://github.com/minetest/minetest.git