Skip to content

Commit f213376

Browse files
sfan5sfan5
committedMar 12, 2021
Update Gitlab-CI configuration too
·
5.11.05.5.0
1 parent bb1c4ba commit f213376

File tree

2 files changed

+27
-29
lines changed

2 files changed

+27
-29
lines changed
 

‎.gitlab-ci.yml

+23-22
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,24 @@ stages:
99
- deploy
1010

1111
variables:
12+
IRRLICHT_TAG: "1.9.0mt0"
1213
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
1314
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
1415

1516
.build_template:
1617
stage: build
18+
before_script:
19+
- apt-get update
20+
- 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
1721
script:
22+
- git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG
23+
- cd irrlicht
24+
- cmake . -DBUILD_SHARED_LIBS=OFF
25+
- make -j2
26+
- cd ..
1827
- mkdir cmakebuild
19-
- mkdir -p artifact/minetest/usr/
2028
- cd cmakebuild
21-
- 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 ..
29+
- cmake -DIRRLICHT_LIBRARY=$PWD/../irrlicht/lib/Linux/libIrrlicht.a -DIRRLICHT_INCLUDE_DIR=$PWD/../irrlicht/include -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE ..
2230
- make -j2
2331
- make install
2432
artifacts:
@@ -30,7 +38,7 @@ variables:
3038
.debpkg_template:
3139
stage: package
3240
before_script:
33-
- apt-get update -y
41+
- apt-get update
3442
- apt-get install -y git
3543
- mkdir -p build/deb/minetest/DEBIAN/
3644
- cp misc/debpkg-control build/deb/minetest/DEBIAN/control
@@ -39,6 +47,7 @@ variables:
3947
- git clone $MINETEST_GAME_REPO build/deb/minetest/usr/share/minetest/games/minetest_game
4048
- rm -rf build/deb/minetest/usr/share/minetest/games/minetest/.git
4149
- sed -i 's/DATEPLACEHOLDER/'$(date +%y.%m.%d)'/g' build/deb/minetest/DEBIAN/control
50+
- sed -i 's/JPEG_PLACEHOLDER/'$JPEG_PKG'/g' build/deb/minetest/DEBIAN/control
4251
- sed -i 's/LEVELDB_PLACEHOLDER/'$LEVELDB_PKG'/g' build/deb/minetest/DEBIAN/control
4352
- cd build/deb/ && dpkg-deb -b minetest/ && mv minetest.deb ../../
4453
artifacts:
@@ -49,7 +58,7 @@ variables:
4958
.debpkg_install:
5059
stage: deploy
5160
before_script:
52-
- apt-get update -y
61+
- apt-get update
5362
script:
5463
- apt-get install -y ./*.deb
5564
- minetest --version
@@ -63,9 +72,6 @@ variables:
6372
build:debian-9:
6473
extends: .build_template
6574
image: debian:9
66-
before_script:
67-
- apt-get update -y
68-
- 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
6975

7076
package:debian-9:
7177
extends: .debpkg_template
@@ -74,6 +80,7 @@ package:debian-9:
7480
- build:debian-9
7581
variables:
7682
LEVELDB_PKG: libleveldb1v5
83+
JPEG_PKG: libjpeg62-turbo
7784

7885
deploy:debian-9:
7986
extends: .debpkg_install
@@ -86,9 +93,6 @@ deploy:debian-9:
8693
build:debian-10:
8794
extends: .build_template
8895
image: debian:10
89-
before_script:
90-
- apt-get update -y
91-
- 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
9296

9397
package:debian-10:
9498
extends: .debpkg_template
@@ -97,6 +101,7 @@ package:debian-10:
97101
- build:debian-10
98102
variables:
99103
LEVELDB_PKG: libleveldb1d
104+
JPEG_PKG: libjpeg62-turbo
100105

101106
deploy:debian-10:
102107
extends: .debpkg_install
@@ -113,9 +118,6 @@ deploy:debian-10:
113118
build:ubuntu-16.04:
114119
extends: .build_template
115120
image: ubuntu:xenial
116-
before_script:
117-
- apt-get update -y
118-
- 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
119121

120122
package:ubuntu-16.04:
121123
extends: .debpkg_template
@@ -124,6 +126,7 @@ package:ubuntu-16.04:
124126
- build:ubuntu-16.04
125127
variables:
126128
LEVELDB_PKG: libleveldb1v5
129+
JPEG_PKG: libjpeg-turbo8
127130

128131
deploy:ubuntu-16.04:
129132
extends: .debpkg_install
@@ -136,9 +139,6 @@ deploy:ubuntu-16.04:
136139
build:ubuntu-18.04:
137140
extends: .build_template
138141
image: ubuntu:bionic
139-
before_script:
140-
- apt-get update -y
141-
- 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
142142

143143
package:ubuntu-18.04:
144144
extends: .debpkg_template
@@ -147,6 +147,7 @@ package:ubuntu-18.04:
147147
- build:ubuntu-18.04
148148
variables:
149149
LEVELDB_PKG: libleveldb1v5
150+
JPEG_PKG: libjpeg-turbo8
150151

151152
deploy:ubuntu-18.04:
152153
extends: .debpkg_install
@@ -163,7 +164,7 @@ build:fedora-28:
163164
extends: .build_template
164165
image: fedora:28
165166
before_script:
166-
- 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
167+
- dnf -y install make git gcc gcc-c++ kernel-devel cmake libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel
167168

168169
##
169170
## MinGW for Windows
@@ -172,7 +173,7 @@ build:fedora-28:
172173
.generic_win_template:
173174
image: ubuntu:bionic
174175
before_script:
175-
- apt-get update -y
176+
- apt-get update
176177
- apt-get install -y wget xz-utils unzip git cmake gettext
177178
- wget -nv http://minetest.kitsunemimi.pw/mingw-w64-${WIN_ARCH}_9.2.0_ubuntu18.04.tar.xz -O mingw.tar.xz
178179
- tar -xaf mingw.tar.xz -C /usr
@@ -183,13 +184,13 @@ build:fedora-28:
183184
artifacts:
184185
expire_in: 1h
185186
paths:
186-
- build/minetest/_build/*
187+
- _build/*
187188

188189
.package_win_template:
189190
extends: .generic_win_template
190191
stage: package
191192
script:
192-
- unzip build/minetest/_build/minetest-*.zip
193+
- unzip _build/minetest-*.zip
193194
- cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libgcc*.dll minetest-*-win*/bin/
194195
- cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libstdc++*.dll minetest-*-win*/bin/
195196
- cp -p /usr/${WIN_ARCH}-w64-mingw32/bin/libwinpthread*.dll minetest-*-win*/bin/
@@ -201,7 +202,7 @@ build:fedora-28:
201202
build:win32:
202203
extends: .build_win_template
203204
script:
204-
- ./util/buildbot/buildwin32.sh build
205+
- EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin32.sh build
205206
variables:
206207
WIN_ARCH: "i686"
207208

@@ -216,7 +217,7 @@ package:win32:
216217
build:win64:
217218
extends: .build_win_template
218219
script:
219-
- ./util/buildbot/buildwin64.sh build
220+
- EXISTING_MINETEST_DIR=$PWD ./util/buildbot/buildwin64.sh build
220221
variables:
221222
WIN_ARCH: "x86_64"
222223

‎misc/debpkg-control

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Section: games
22
Priority: extra
33
Standards-Version: 3.6.2
44
Package: minetest-staging
5-
Version: 0.4.15-DATEPLACEHOLDER
6-
Depends: libc6, libcurl3-gnutls, libfreetype6, libirrlicht1.8, libjsoncpp1, LEVELDB_PLACEHOLDER, liblua5.1-0, libluajit-5.1-2, libopenal1, libsqlite3-0, libstdc++6, libvorbisfile3, libx11-6, zlib1g
5+
Version: 5.4.0-DATEPLACEHOLDER
6+
Depends: libc6, libcurl3-gnutls, libfreetype6, libgl1, JPEG_PLACEHOLDER, libjsoncpp1, LEVELDB_PLACEHOLDER, libopenal1, libpng16-16, libsqlite3-0, libstdc++6, libvorbisfile3, libx11-6, libxxf86vm1, zlib1g
77
Maintainer: Loic Blot <loic.blot@unix-experience.fr>
88
Homepage: https://www.minetest.net/
99
Vcs-Git: https://github.com/minetest/minetest.git
@@ -12,23 +12,20 @@ Architecture: amd64
1212
Build-Depends:
1313
cmake,
1414
gettext,
15-
libbz2-dev,
1615
libcurl4-gnutls-dev,
1716
libfreetype6-dev,
18-
libglu1-mesa-dev,
19-
libirrlicht-dev (>= 1.7.0),
17+
libgl1-mesa-dev,
2018
libjpeg-dev,
2119
libjsoncpp-dev,
2220
libleveldb-dev,
23-
libluajit-5.1-dev | liblua5.1-dev,
2421
libogg-dev,
2522
libopenal-dev,
2623
libpng-dev,
2724
libsqlite3-dev,
2825
libvorbis-dev,
2926
libx11-dev,
3027
zlib1g-dev
31-
Description: Multiplayer infinite-world block sandbox (server)
28+
Description: Multiplayer infinite-world block sandbox game
3229
Minetest is a minecraft-inspired game written from scratch and licensed
3330
under the LGPL (version 2.1 or later). It supports both survival and creative
3431
modes along with multiplayer support, dynamic lighting, and an "infinite" map

0 commit comments

Comments
 (0)
Please sign in to comment.