Merge pull request #59 from PrairieAstronomer/readme_irrlicht_change

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 252ed8a5bfaefc10016bde5f003b82ae25a48be1..8e81865709e33fdf2d2c4f205d39a4013243e20b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
   - deploy
 
 variables:
-  IRRLICHT_TAG: "1.9.0mt3"
+  IRRLICHT_TAG: "1.9.0mt6"
   MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
   CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
 
@@ -17,14 +17,12 @@ 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 libzstd-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
-    - cd cmakebuild
-    - cmake -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE ..
-    - make -j2
-    - make install
+    - cmake -B build -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE ..
+    - cmake --build build --parallel $(($(nproc) + 1))
+    - cmake --install build
   artifacts:
     when: on_success
     expire_in: 1h
@@ -134,49 +132,49 @@ deploy:debian-11:
 ## Ubuntu
 ##
 
-# Xenial
+# Bionic
 
-build:ubuntu-16.04:
+build:ubuntu-18.04:
   extends: .build_template
-  image: ubuntu:xenial
+  image: ubuntu:bionic
 
-package:ubuntu-16.04:
+package:ubuntu-18.04:
   extends: .debpkg_template
-  image: ubuntu:xenial
+  image: ubuntu:bionic
   needs:
-    - build:ubuntu-16.04
+    - build:ubuntu-18.04
   variables:
     JSONCPP_PKG: libjsoncpp1
     LEVELDB_PKG: libleveldb1v5
     JPEG_PKG: libjpeg-turbo8
 
-deploy:ubuntu-16.04:
+deploy:ubuntu-18.04:
   extends: .debpkg_install
-  image: ubuntu:xenial
+  image: ubuntu:bionic
   needs:
-    - package:ubuntu-16.04
+    - package:ubuntu-18.04
 
-# Bionic
+# Focal
 
-build:ubuntu-18.04:
+build:ubuntu-20.04:
   extends: .build_template
-  image: ubuntu:bionic
+  image: ubuntu:focal
 
-package:ubuntu-18.04:
+package:ubuntu-20.04:
   extends: .debpkg_template
-  image: ubuntu:bionic
+  image: ubuntu:focal
   needs:
-    - build:ubuntu-18.04
+    - build:ubuntu-20.04
   variables:
     JSONCPP_PKG: libjsoncpp1
-    LEVELDB_PKG: libleveldb1v5
+    LEVELDB_PKG: libleveldb1d
     JPEG_PKG: libjpeg-turbo8
 
-deploy:ubuntu-18.04:
+deploy:ubuntu-20.04:
   extends: .debpkg_install
-  image: ubuntu:bionic
+  image: ubuntu:focal
   needs:
-    - package:ubuntu-18.04
+    - package:ubuntu-20.04
 
 ##
 ## Fedora
@@ -198,25 +196,12 @@ build:fedora-28:
   before_script:
     - apt-get update
     - DEBIAN_FRONTEND=noninteractive apt-get install -y wget xz-utils unzip git cmake gettext
-    - wget -nv http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
+    - wget -nv http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_11.2.0_ubuntu20.04.tar.xz -O mingw.tar.xz
     - tar -xaf mingw.tar.xz -C /usr
 
 .build_win_template:
   extends: .generic_win_template
   stage: build
-  artifacts:
-    expire_in: 1h
-    paths:
-      - build/build/*.zip
-
-.package_win_template:
-  extends: .generic_win_template
-  stage: package
-  script:
-    - unzip build/build/*.zip
-    - cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libgcc*.dll minetest-*-win*/bin/
-    - cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libstdc++*.dll minetest-*-win*/bin/
-    - cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libwinpthread*.dll minetest-*-win*/bin/
   artifacts:
     expire_in: 90 day
     paths:
@@ -226,28 +211,15 @@ build:win32:
   extends: .build_win_template
   script:
     - EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh build
+    - unzip -q build/build/*.zip
   variables:
     WIN_ARCH: "i686"
 
-package:win32:
-  extends: .package_win_template
-  needs:
-    - build:win32
-  variables:
-    WIN_ARCH: "i686"
-
-
 build:win64:
   extends: .build_win_template
   script:
     - EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh build
-  variables:
-    WIN_ARCH: "x86_64"
-
-package:win64:
-  extends: .package_win_template
-  needs:
-    - build:win64
+    - unzip -q build/build/*.zip
   variables:
     WIN_ARCH: "x86_64"