mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Automated build changes (#9619)
* Automated build changes * drop a useless ubuntu non lts version * update gitlab ci syntax to modern one * add debian 10 step on the gitlab ci pipeline * switch docker build to Debian 10 * add .gradle folder to gitignore
This commit is contained in:
parent
3ad5388c6d
commit
12275e235a
2
.gitignore
vendored
2
.gitignore
vendored
@ -26,6 +26,8 @@ gtags.files
|
|||||||
*.project
|
*.project
|
||||||
# Visual Studio Code
|
# Visual Studio Code
|
||||||
.vscode/
|
.vscode/
|
||||||
|
# Gradle
|
||||||
|
.gradle
|
||||||
|
|
||||||
## Files related to Minetest development cycle
|
## Files related to Minetest development cycle
|
||||||
/*.patch
|
/*.patch
|
||||||
|
126
.gitlab-ci.yml
126
.gitlab-ci.yml
@ -12,7 +12,7 @@ variables:
|
|||||||
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
|
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
|
||||||
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
|
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
|
||||||
|
|
||||||
.build_template: &build_definition
|
.build_template:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- mkdir cmakebuild
|
- mkdir cmakebuild
|
||||||
@ -27,7 +27,7 @@ variables:
|
|||||||
paths:
|
paths:
|
||||||
- artifact/*
|
- artifact/*
|
||||||
|
|
||||||
.debpkg_template: &debpkg_template
|
.debpkg_template:
|
||||||
stage: package
|
stage: package
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update -y
|
- apt-get update -y
|
||||||
@ -47,7 +47,7 @@ variables:
|
|||||||
paths:
|
paths:
|
||||||
- ./*.deb
|
- ./*.deb
|
||||||
|
|
||||||
.debpkg_install: &debpkg_install
|
.debpkg_install:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update -y
|
- apt-get update -y
|
||||||
@ -62,7 +62,7 @@ variables:
|
|||||||
# Jessie
|
# Jessie
|
||||||
|
|
||||||
build:debian-8:
|
build:debian-8:
|
||||||
<<: *build_definition
|
extends: .build_template
|
||||||
image: debian:8
|
image: debian:8
|
||||||
before_script:
|
before_script:
|
||||||
- echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" > /etc/apt/sources.list.d/uptodate-toolchain.list
|
- echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" > /etc/apt/sources.list.d/uptodate-toolchain.list
|
||||||
@ -74,46 +74,70 @@ build:debian-8:
|
|||||||
CXX: g++-6
|
CXX: g++-6
|
||||||
|
|
||||||
package:debian-8:
|
package:debian-8:
|
||||||
|
extends: .debpkg_template
|
||||||
image: debian:8
|
image: debian:8
|
||||||
dependencies:
|
dependencies:
|
||||||
- build:debian-8
|
- build:debian-8
|
||||||
variables:
|
variables:
|
||||||
LEVELDB_PKG: libleveldb1
|
LEVELDB_PKG: libleveldb1
|
||||||
<<: *debpkg_template
|
|
||||||
|
|
||||||
deploy:debian-8:
|
deploy:debian-8:
|
||||||
|
extends: .debpkg_install
|
||||||
image: debian:8
|
image: debian:8
|
||||||
dependencies:
|
dependencies:
|
||||||
- package:debian-8
|
- package:debian-8
|
||||||
variables:
|
variables:
|
||||||
LEVELDB_PKG: libleveldb1
|
LEVELDB_PKG: libleveldb1
|
||||||
<<: *debpkg_install
|
|
||||||
|
|
||||||
# Stretch
|
# Stretch
|
||||||
|
|
||||||
build:debian-9:
|
build:debian-9:
|
||||||
<<: *build_definition
|
extends: .build_template
|
||||||
image: debian:9
|
image: debian:9
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update -y
|
- 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 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:
|
package:debian-9:
|
||||||
|
extends: .debpkg_template
|
||||||
image: debian:9
|
image: debian:9
|
||||||
dependencies:
|
dependencies:
|
||||||
- build:debian-9
|
- build:debian-9
|
||||||
variables:
|
variables:
|
||||||
LEVELDB_PKG: libleveldb1v5
|
LEVELDB_PKG: libleveldb1v5
|
||||||
<<: *debpkg_template
|
|
||||||
|
|
||||||
deploy:debian-9:
|
deploy:debian-9:
|
||||||
|
extends: .debpkg_install
|
||||||
image: debian:9
|
image: debian:9
|
||||||
dependencies:
|
dependencies:
|
||||||
- package:debian-9
|
- package:debian-9
|
||||||
variables:
|
variables:
|
||||||
LEVELDB_PKG: libleveldb1v5
|
LEVELDB_PKG: libleveldb1v5
|
||||||
<<: *debpkg_install
|
|
||||||
|
|
||||||
|
# Stretch
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
package:debian-10:
|
||||||
|
extends: .debpkg_template
|
||||||
|
image: debian:10
|
||||||
|
dependencies:
|
||||||
|
- build:debian-10
|
||||||
|
variables:
|
||||||
|
LEVELDB_PKG: libleveldb1d
|
||||||
|
|
||||||
|
deploy:debian-10:
|
||||||
|
extends: .debpkg_install
|
||||||
|
image: debian:10
|
||||||
|
dependencies:
|
||||||
|
- package:debian-10
|
||||||
|
variables:
|
||||||
|
LEVELDB_PKG: libleveldb1d
|
||||||
##
|
##
|
||||||
## Ubuntu
|
## Ubuntu
|
||||||
##
|
##
|
||||||
@ -121,7 +145,7 @@ deploy:debian-9:
|
|||||||
# Trusty
|
# Trusty
|
||||||
|
|
||||||
build:ubuntu-14.04:
|
build:ubuntu-14.04:
|
||||||
<<: *build_definition
|
extends: .build_template
|
||||||
image: ubuntu:trusty
|
image: ubuntu:trusty
|
||||||
before_script:
|
before_script:
|
||||||
- echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" > /etc/apt/sources.list.d/uptodate-toolchain.list
|
- echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" > /etc/apt/sources.list.d/uptodate-toolchain.list
|
||||||
@ -133,102 +157,53 @@ build:ubuntu-14.04:
|
|||||||
CXX: g++-6
|
CXX: g++-6
|
||||||
|
|
||||||
package:ubuntu-14.04:
|
package:ubuntu-14.04:
|
||||||
|
extends: .debpkg_template
|
||||||
image: ubuntu:trusty
|
image: ubuntu:trusty
|
||||||
dependencies:
|
dependencies:
|
||||||
- build:ubuntu-14.04
|
- build:ubuntu-14.04
|
||||||
variables:
|
variables:
|
||||||
LEVELDB_PKG: libleveldb1
|
LEVELDB_PKG: libleveldb1
|
||||||
<<: *debpkg_template
|
|
||||||
|
|
||||||
deploy:ubuntu-14.04:
|
deploy:ubuntu-14.04:
|
||||||
|
extends: .debpkg_install
|
||||||
image: ubuntu:trusty
|
image: ubuntu:trusty
|
||||||
dependencies:
|
dependencies:
|
||||||
- package:ubuntu-14.04
|
- package:ubuntu-14.04
|
||||||
variables:
|
variables:
|
||||||
LEVELDB_PKG: libleveldb1
|
LEVELDB_PKG: libleveldb1
|
||||||
<<: *debpkg_install
|
|
||||||
|
|
||||||
# Xenial
|
# Xenial
|
||||||
|
|
||||||
build:ubuntu-16.04:
|
build:ubuntu-16.04:
|
||||||
<<: *build_definition
|
extends: .build_template
|
||||||
image: ubuntu:xenial
|
image: ubuntu:xenial
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update -y
|
- 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 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:
|
package:ubuntu-16.04:
|
||||||
|
extends: .debpkg_template
|
||||||
image: ubuntu:xenial
|
image: ubuntu:xenial
|
||||||
dependencies:
|
dependencies:
|
||||||
- build:ubuntu-16.04
|
- build:ubuntu-16.04
|
||||||
variables:
|
variables:
|
||||||
LEVELDB_PKG: libleveldb1v5
|
LEVELDB_PKG: libleveldb1v5
|
||||||
<<: *debpkg_template
|
|
||||||
|
|
||||||
deploy:ubuntu-16.04:
|
deploy:ubuntu-16.04:
|
||||||
|
extends: .debpkg_install
|
||||||
image: ubuntu:xenial
|
image: ubuntu:xenial
|
||||||
dependencies:
|
dependencies:
|
||||||
- package:ubuntu-16.04
|
- package:ubuntu-16.04
|
||||||
variables:
|
variables:
|
||||||
LEVELDB_PKG: libleveldb1v5
|
LEVELDB_PKG: libleveldb1v5
|
||||||
<<: *debpkg_install
|
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
#package:ubuntu-16.10:
|
|
||||||
# image: ubuntu:yakkety
|
|
||||||
# dependencies:
|
|
||||||
# - build:ubuntu-16.10
|
|
||||||
# variables:
|
|
||||||
# LEVELDB_PKG: libleveldb1v5
|
|
||||||
# <<: *debpkg_template
|
|
||||||
|
|
||||||
#deploy:ubuntu-16.10:
|
|
||||||
# image: ubuntu:yakkety
|
|
||||||
# dependencies:
|
|
||||||
# - package:ubuntu-16.10
|
|
||||||
# variables:
|
|
||||||
# LEVELDB_PKG: libleveldb1v5
|
|
||||||
# <<: *debpkg_install
|
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
#package:ubuntu-17.04:
|
|
||||||
# image: ubuntu:zesty
|
|
||||||
# dependencies:
|
|
||||||
# - build:ubuntu-17.04
|
|
||||||
# variables:
|
|
||||||
# LEVELDB_PKG: libleveldb1v5
|
|
||||||
# <<: *debpkg_template
|
|
||||||
|
|
||||||
#deploy:ubuntu-17.04:
|
|
||||||
# image: ubuntu:zesty
|
|
||||||
# dependencies:
|
|
||||||
# - package:ubuntu-17.04
|
|
||||||
# variables:
|
|
||||||
# LEVELDB_PKG: libleveldb1v5
|
|
||||||
# <<: *debpkg_install
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## Fedora
|
## Fedora
|
||||||
##
|
##
|
||||||
|
|
||||||
|
# Do we need to support this old version ?
|
||||||
build:fedora-24:
|
build:fedora-24:
|
||||||
<<: *build_definition
|
extends: .build_template
|
||||||
image: fedora:24
|
image: fedora:24
|
||||||
before_script:
|
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
|
- 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
|
||||||
@ -238,7 +213,7 @@ build:fedora-24:
|
|||||||
## Mingw for Windows
|
## Mingw for Windows
|
||||||
##
|
##
|
||||||
|
|
||||||
.generic_win_template: &generic_win_template
|
.generic_win_template:
|
||||||
image: ubuntu:bionic
|
image: ubuntu:bionic
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update -y
|
- apt-get update -y
|
||||||
@ -247,8 +222,8 @@ build:fedora-24:
|
|||||||
- sed -e "s|%PREFIX%|${WIN_ARCH}-w64-mingw32|" -e "s|%ROOTPATH%|/usr/${WIN_ARCH}-w64-mingw32|" < util/travis/toolchain_mingw.cmake.in > ${TOOLCHAIN_OUTPUT}
|
- sed -e "s|%PREFIX%|${WIN_ARCH}-w64-mingw32|" -e "s|%ROOTPATH%|/usr/${WIN_ARCH}-w64-mingw32|" < util/travis/toolchain_mingw.cmake.in > ${TOOLCHAIN_OUTPUT}
|
||||||
- tar -xaf mingw.tar.xz -C /usr
|
- tar -xaf mingw.tar.xz -C /usr
|
||||||
|
|
||||||
.build_win_template: &build_win_template
|
.build_win_template:
|
||||||
<<: *generic_win_template
|
extends: .generic_win_template
|
||||||
stage: build
|
stage: build
|
||||||
artifacts:
|
artifacts:
|
||||||
when: on_success
|
when: on_success
|
||||||
@ -256,8 +231,8 @@ build:fedora-24:
|
|||||||
paths:
|
paths:
|
||||||
- build/*
|
- build/*
|
||||||
|
|
||||||
.package_win_template: &package_win_template
|
.package_win_template:
|
||||||
<<: *generic_win_template
|
extends: .generic_win_template
|
||||||
stage: package
|
stage: package
|
||||||
script:
|
script:
|
||||||
- cd build/minetest/_build
|
- cd build/minetest/_build
|
||||||
@ -275,7 +250,7 @@ build:fedora-24:
|
|||||||
- minetest-win-*/*
|
- minetest-win-*/*
|
||||||
|
|
||||||
build:win32:
|
build:win32:
|
||||||
<<: *build_win_template
|
extends: .build_win_template
|
||||||
script:
|
script:
|
||||||
- ./util/buildbot/buildwin32.sh build
|
- ./util/buildbot/buildwin32.sh build
|
||||||
variables:
|
variables:
|
||||||
@ -284,7 +259,7 @@ build:win32:
|
|||||||
TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw.cmake"
|
TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw.cmake"
|
||||||
|
|
||||||
package:win32:
|
package:win32:
|
||||||
<<: *package_win_template
|
extends: .package_win_template
|
||||||
dependencies:
|
dependencies:
|
||||||
- build:win32
|
- build:win32
|
||||||
variables:
|
variables:
|
||||||
@ -293,7 +268,7 @@ package:win32:
|
|||||||
TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw.cmake"
|
TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw.cmake"
|
||||||
|
|
||||||
build:win64:
|
build:win64:
|
||||||
<<: *build_win_template
|
extends: .build_win_template
|
||||||
script:
|
script:
|
||||||
- ./util/buildbot/buildwin64.sh build
|
- ./util/buildbot/buildwin64.sh build
|
||||||
variables:
|
variables:
|
||||||
@ -302,7 +277,7 @@ build:win64:
|
|||||||
TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw64.cmake"
|
TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw64.cmake"
|
||||||
|
|
||||||
package:win64:
|
package:win64:
|
||||||
<<: *package_win_template
|
extends: .package_win_template
|
||||||
dependencies:
|
dependencies:
|
||||||
- build:win64
|
- build:win64
|
||||||
variables:
|
variables:
|
||||||
@ -338,3 +313,4 @@ pages:
|
|||||||
- public
|
- public
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM debian:stretch
|
FROM debian:buster
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
RUN apt-get update -y && \
|
RUN apt-get update -y && \
|
||||||
|
Loading…
Reference in New Issue
Block a user