X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.gitlab-ci.yml;h=d48dd5fcd5fbf6172218975af9ab46461d945037;hb=4d83eb796b317901df3b2be8f3c8ace339f9bb95;hp=ef3b371a4b1a905054698426a97e9e12ebe63658;hpb=af9630962134346750f12c9f1856eae00e0dfe02;p=minetest.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef3b371a4..d48dd5fcd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
     - make install
   artifacts:
     when: on_success
-    expire_in: 1h
+    expire_in: 2h
     paths:
       - artifact/*
 
@@ -39,12 +39,12 @@ variables:
     - 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
   stage: deploy
@@ -52,7 +52,7 @@ variables:
     - 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
+    - dpkg -i ./*.deb
 
 ##
 ## Debian
@@ -64,8 +64,13 @@ 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 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 -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
@@ -115,11 +120,16 @@ deploy:debian-9:
 # Trusty
 
 build:ubuntu-14.04:
- <<: *build_definition
- image: ubuntu:trusty
- 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_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
+  variables:
+    CC: gcc-6
+    CXX: g++-6
 
 package:ubuntu-14.04:
   image: ubuntu:trusty
@@ -140,11 +150,11 @@ deploy:ubuntu-14.04:
 # Xenial
 
 build:ubuntu-16.04:
- <<: *build_definition
- 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
+  <<: *build_definition
+  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:
   image: ubuntu:xenial
@@ -165,11 +175,11 @@ deploy:ubuntu-16.04:
 # Yakkety
 
 build:ubuntu-16.10:
- <<: *build_definition
- image: ubuntu:yakkety
- 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_definition
+  image: ubuntu:yakkety
+  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
@@ -190,11 +200,11 @@ deploy:ubuntu-16.10:
 # Zesty
 
 build:ubuntu-17.04:
- <<: *build_definition
- image: ubuntu:zesty
- 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_definition
+  image: ubuntu:zesty
+  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-17.04:
   image: ubuntu:zesty
@@ -221,3 +231,80 @@ build:fedora-24:
   image: fedora:24
   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
+
+
+##
+## Mingw for Windows
+##
+
+.generic_win_template: &generic_win_template
+  image: ubuntu:xenial
+  before_script:
+    - apt-get update -y
+    - apt-get install -y p7zip-full wget unzip git cmake gettext
+    - wget http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_7.1.1_ubuntu14.04.7z -O mingw.7z > /dev/null
+    - sed -e "s|%PREFIX%|${WIN_ARCH}-w64-mingw32|" -e "s|%ROOTPATH%|/usr/${WIN_ARCH}-w64-mingw32|" < util/travis/toolchain_mingw.cmake.in > ${TOOLCHAIN_OUTPUT}
+    - 7z x -y -o/usr mingw.7z > /dev/null
+
+.build_win_template: &build_win_template
+  <<: *generic_win_template
+  stage: build
+  artifacts:
+    when: on_success
+    expire_in: 2h
+    paths:
+      - build/*
+
+.package_win_template: &package_win_template
+  <<: *generic_win_template
+  stage: package
+  script:
+    - cd build/minetest/_build
+    - make package
+    - cd ../../../
+    - mkdir minetest-win-${WIN_ARCH}
+    - unzip build/minetest/_build/minetest-*-win*.zip -d minetest-win-${WIN_ARCH}
+    - cp /usr/${WIN_ARCH}-w64-mingw32/bin/libgcc*.dll minetest-win-${WIN_ARCH}/minetest-*-win*/bin
+    - cp /usr/${WIN_ARCH}-w64-mingw32/bin/libstdc++*.dll minetest-win-${WIN_ARCH}/minetest-*-win*/bin
+    - cp /usr/${WIN_ARCH}-w64-mingw32/bin/libwinpthread*.dll minetest-win-${WIN_ARCH}/minetest-*-win*/bin
+  artifacts:
+    when: on_success
+    expire_in: 90 day
+    paths:
+      - minetest-win-*/*
+
+build:win32:
+  <<: *build_win_template
+  script:
+    - ./util/buildbot/buildwin32.sh build
+  variables:
+    NO_PACKAGE: "1"
+    WIN_ARCH: "i686"
+    TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw.cmake"
+
+package:win32:
+  <<: *package_win_template
+  dependencies:
+    - build:win32
+  variables:
+    NO_PACKAGE: "1"
+    WIN_ARCH: "i686"
+    TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw.cmake"
+
+build:win64:
+  <<: *build_win_template
+  script:
+    - ./util/buildbot/buildwin64.sh build
+  variables:
+    NO_PACKAGE: "1"
+    WIN_ARCH: "x86_64"
+    TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw64.cmake"
+
+package:win64:
+  <<: *package_win_template
+  dependencies:
+    - build:win64
+  variables:
+    NO_PACKAGE: "1"
+    WIN_ARCH: "x86_64"
+    TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw64.cmake"