X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=.gitlab-ci.yml;h=0441aeaa1637aa8ab5a4891210fdf76b0de16067;hb=54bbea30ef2ad30a4756e53387bc8aea7ad35bb3;hp=ad1b9a8c34f223f709ddc8747535d34c1e1cd987;hpb=bfacfc20624a46f05193e7e036a58ec906450494;p=dragonfireclient.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad1b9a8c3..0441aeaa1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,14 +10,15 @@ stages:
 
 variables:
   MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
+  CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
 
-.build_template: &build_definition
+.build_template:
   stage: build
   script:
     - mkdir cmakebuild
     - mkdir -p artifact/minetest/usr/
     - cd cmakebuild
-    - cmake -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE ..
+    - cmake -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DENABLE_SYSTEM_JSONCPP=TRUE -DBUILD_SERVER=TRUE ..
     - make -j2
     - make install
   artifacts:
@@ -26,208 +27,267 @@ variables:
     paths:
       - artifact/*
 
-.debpkg_template: &debpkg_template
+.debpkg_template:
   stage: package
   before_script:
     - apt-get update -y
     - apt-get install -y git
     - mkdir -p build/deb/minetest/DEBIAN/
     - cp misc/debpkg-control build/deb/minetest/DEBIAN/control
-    - cp -Rp artifact/minetest/usr build/deb/minetest/
+    - cp -a artifact/minetest/usr build/deb/minetest/
   script:
-    - git clone $MINETEST_GAME_REPO build/deb/minetest/usr/share/minetest/games/minetest
-    - rm -Rf build/deb/minetest/usr/share/minetest/games/minetest/.git
+    - git clone $MINETEST_GAME_REPO build/deb/minetest/usr/share/minetest/games/minetest_game
+    - rm -rf build/deb/minetest/usr/share/minetest/games/minetest/.git
     - sed -i 's/DATEPLACEHOLDER/'$(date +%y.%m.%d)'/g' build/deb/minetest/DEBIAN/control
     - sed -i 's/LEVELDB_PLACEHOLDER/'$LEVELDB_PKG'/g' build/deb/minetest/DEBIAN/control
-    - cd build/deb/ && dpkg-deb -b minetest/
+    - cd build/deb/ && dpkg-deb -b minetest/ && mv minetest.deb ../../
   artifacts:
-    when: on_success
-    expire_in: 30 day
+    expire_in: 90 day
     paths:
-      - build/deb/*.deb
+      - ./*.deb
 
-.debpkg_install: &debpkg_install
+.debpkg_install:
   stage: deploy
   before_script:
     - apt-get update -y
-    - apt-get install -y libc6 libcurl3-gnutls libfreetype6 libirrlicht1.8 $LEVELDB_PKG liblua5.1-0 libluajit-5.1-2 libopenal1 libstdc++6 libvorbisfile3 libx11-6 zlib1g
   script:
-    - dpkg -i build/deb/*.deb
+    - apt-get install -y ./*.deb
+    - minetest --version
 
 ##
 ## Debian
 ##
 
-# Jessie
-
-build:debian-8:
-  <<: *build_definition
-  image: debian:8
-  before_script:
-    - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" > /etc/apt/sources.list.d/uptodate-toolchain.list
-    - apt-key adv --keyserver keyserver.ubuntu.com --recv BA9EF27F
-    - apt-get update -y
-    - apt-get -y install build-essential gcc-6 g++-6 libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
-  variables:
-    CC: gcc-6
-    CXX: g++-6
-
-package:debian-8:
-  image: debian:8
-  dependencies:
-    - build:debian-8
-  variables:
-    LEVELDB_PKG: libleveldb1
-  <<: *debpkg_template
-
-deploy:debian-8:
-  image: debian:8
-  dependencies:
-    - package:debian-8
-  variables:
-    LEVELDB_PKG: libleveldb1
-  <<: *debpkg_install
-
 # Stretch
 
 build:debian-9:
- <<: *build_definition
+ extends: .build_template
  image: debian:9
  before_script:
    - apt-get update -y
    - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
 package:debian-9:
+  extends: .debpkg_template
   image: debian:9
-  dependencies:
+  needs:
     - build:debian-9
   variables:
     LEVELDB_PKG: libleveldb1v5
-  <<: *debpkg_template
 
 deploy:debian-9:
+  extends: .debpkg_install
   image: debian:9
-  dependencies:
+  needs:
     - package:debian-9
-  variables:
-    LEVELDB_PKG: libleveldb1v5
-  <<: *debpkg_install
 
-##
-## Ubuntu
-##
+# Buster
 
-# Trusty
+build:debian-10:
+ extends: .build_template
+ image: debian:10
+ before_script:
+   - apt-get update -y
+   - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
-build:ubuntu-14.04:
-  <<: *build_definition
-  image: ubuntu:trusty
-  before_script:
-    - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" > /etc/apt/sources.list.d/uptodate-toolchain.list
-    - apt-key adv --keyserver keyserver.ubuntu.com --recv BA9EF27F
-    - apt-get update -y
-    - apt-get -y install build-essential gcc-6 g++-6 libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+package:debian-10:
+  extends: .debpkg_template
+  image: debian:10
+  needs:
+    - build:debian-10
   variables:
-    CC: gcc-6
-    CXX: g++-6
+    LEVELDB_PKG: libleveldb1d
 
-package:ubuntu-14.04:
-  image: ubuntu:trusty
-  dependencies:
-    - build:ubuntu-14.04
-  variables:
-    LEVELDB_PKG: libleveldb1
-  <<: *debpkg_template
+deploy:debian-10:
+  extends: .debpkg_install
+  image: debian:10
+  needs:
+    - package:debian-10
 
-deploy:ubuntu-14.04:
-  image: ubuntu:trusty
-  dependencies:
-    - package:ubuntu-14.04
-  variables:
-    LEVELDB_PKG: libleveldb1
-  <<: *debpkg_install
+##
+## Ubuntu
+##
 
 # Xenial
 
 build:ubuntu-16.04:
-  <<: *build_definition
+  extends: .build_template
   image: ubuntu:xenial
   before_script:
     - apt-get update -y
     - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
 package:ubuntu-16.04:
+  extends: .debpkg_template
   image: ubuntu:xenial
-  dependencies:
+  needs:
     - build:ubuntu-16.04
   variables:
     LEVELDB_PKG: libleveldb1v5
-  <<: *debpkg_template
 
 deploy:ubuntu-16.04:
+  extends: .debpkg_install
   image: ubuntu:xenial
-  dependencies:
+  needs:
     - package:ubuntu-16.04
-  variables:
-    LEVELDB_PKG: libleveldb1v5
-  <<: *debpkg_install
 
-# Yakkety
+# Bionic
 
-build:ubuntu-16.10:
-  <<: *build_definition
-  image: ubuntu:yakkety
+build:ubuntu-18.04:
+  extends: .build_template
+  image: ubuntu:bionic
   before_script:
     - apt-get update -y
     - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
 
-package:ubuntu-16.10:
-  image: ubuntu:yakkety
-  dependencies:
-    - build:ubuntu-16.10
+package:ubuntu-18.04:
+  extends: .debpkg_template
+  image: ubuntu:bionic
+  needs:
+    - build:ubuntu-18.04
   variables:
     LEVELDB_PKG: libleveldb1v5
-  <<: *debpkg_template
 
-deploy:ubuntu-16.10:
-  image: ubuntu:yakkety
-  dependencies:
-    - package:ubuntu-16.10
-  variables:
-    LEVELDB_PKG: libleveldb1v5
-  <<: *debpkg_install
+deploy:ubuntu-18.04:
+  extends: .debpkg_install
+  image: ubuntu:bionic
+  needs:
+    - package:ubuntu-18.04
+
+##
+## Fedora
+##
+
+# Fedora 28 <-> RHEL 8
+build:fedora-28:
+  extends: .build_template
+  image: fedora:28
+  before_script:
+    - dnf -y install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel
 
-# Zesty
+##
+## MinGW for Windows
+##
 
-build:ubuntu-17.04:
-  <<: *build_definition
-  image: ubuntu:zesty
+.generic_win_template:
+  image: ubuntu:bionic
   before_script:
     - apt-get update -y
-    - apt-get -y install build-essential libirrlicht-dev cmake libbz2-dev libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
+    - 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
+    - tar -xaf mingw.tar.xz -C /usr
 
-package:ubuntu-17.04:
-  image: ubuntu:zesty
-  dependencies:
-    - build:ubuntu-17.04
+.build_win_template:
+  extends: .generic_win_template
+  stage: build
+  artifacts:
+    expire_in: 1h
+    paths:
+      - build/minetest/_build/*
+
+.package_win_template:
+  extends: .generic_win_template
+  stage: package
+  script:
+    - unzip build/minetest/_build/minetest-*.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:
+      - minetest-*-win*/*
+
+build:win32:
+  extends: .build_win_template
+  script:
+    - ./util/buildbot/buildwin32.sh build
   variables:
-    LEVELDB_PKG: libleveldb1v5
-  <<: *debpkg_template
+    WIN_ARCH: "i686"
 
-deploy:ubuntu-17.04:
-  image: ubuntu:zesty
-  dependencies:
-    - package:ubuntu-17.04
+package:win32:
+  extends: .package_win_template
+  needs:
+    - build:win32
   variables:
-    LEVELDB_PKG: libleveldb1v5
-  <<: *debpkg_install
+    WIN_ARCH: "i686"
+
+
+build:win64:
+  extends: .build_win_template
+  script:
+    - ./util/buildbot/buildwin64.sh build
+  variables:
+    WIN_ARCH: "x86_64"
+
+package:win64:
+  extends: .package_win_template
+  needs:
+    - build:win64
+  variables:
+    WIN_ARCH: "x86_64"
 
 ##
-## Fedora
+## Docker
 ##
 
-build:fedora-24:
-  <<: *build_definition
-  image: fedora:24
+package:docker:
+  stage: package
+  image: docker:stable
+  services:
+    - docker:dind
   before_script:
-    - dnf -y install make automake gcc gcc-c++ kernel-devel cmake libcurl* openal* libvorbis* libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel irrlicht-devel bzip2-libs gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel doxygen spatialindex-devel bzip2-devel
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
+  script:
+    - docker build . -t ${CONTAINER_IMAGE}/server:$CI_COMMIT_SHA -t ${CONTAINER_IMAGE}/server:$CI_COMMIT_REF_NAME -t ${CONTAINER_IMAGE}/server:latest
+    - docker push ${CONTAINER_IMAGE}/server:$CI_COMMIT_SHA
+    - docker push ${CONTAINER_IMAGE}/server:$CI_COMMIT_REF_NAME
+    - docker push ${CONTAINER_IMAGE}/server:latest
+
+##
+## Gitlab Pages (Lua API documentation)
+##
+
+pages:
+  stage: deploy
+  image: python:3.8
+  before_script:
+    - pip install git+https://github.com/Python-Markdown/markdown.git
+    - pip install git+https://github.com/mkdocs/mkdocs.git
+    - pip install pygments
+  script:
+    - cd doc/mkdocs && ./build.sh
+  artifacts:
+    paths:
+      - public
+  only:
+    - master
+
+##
+## AppImage
+##
+
+package:appimage-client:
+  stage: package
+  image: appimagecrafters/appimage-builder
+  needs:
+    - build:ubuntu-18.04
+  before_script:
+    - apt-get update -y
+    - apt-get install -y git wget
+    # Collect files
+    - mkdir AppDir
+    - cp -a artifact/minetest/usr/ AppDir/usr/
+    - rm AppDir/usr/bin/minetestserver
+    - cp -a clientmods AppDir/usr/share/minetest
+  script:
+    - git clone $MINETEST_GAME_REPO AppDir/usr/share/minetest/games/minetest_game
+    - rm -rf AppDir/usr/share/minetest/games/minetest/.git
+    - export VERSION=$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
+    # Remove PrefersNonDefaultGPU property due to validation errors
+    - sed -i '/PrefersNonDefaultGPU/d' AppDir/usr/share/applications/net.minetest.minetest.desktop
+    - appimage-builder --skip-test
+  artifacts:
+    expire_in: 90 day
+    paths:
+      - ./*.AppImage