Attempt to fix builds
• Ubuntu 18.04 builds • Use HTTPS in Windows build scripts • Use the correct repo for Windows build scripts
This commit is contained in:
luk3yx
parent
18931c0df9
commit
afeb6afaf0
@ -1,7 +1,7 @@
|
||||
---
|
||||
# Github repository is cloned every day on Gitlab.com
|
||||
# https://gitlab.com/minetest/minetest
|
||||
# Pipelines URL: https://gitlab.com/minetest/minetest/pipelines
|
||||
# Automated builds(?)
|
||||
# https://gitlab.com/luk3yx/minetest
|
||||
# Pipelines URL: https://gitlab.com/luk3yx/minetest/pipelines
|
||||
|
||||
stages:
|
||||
- build
|
||||
@ -174,6 +174,22 @@ package:ubuntu-16.04:
|
||||
# LEVELDB_PKG: libleveldb1v5
|
||||
# <<: *debpkg_template
|
||||
|
||||
|
||||
build:ubuntu-18.04:
|
||||
<<: *build_definition
|
||||
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-18.04:
|
||||
image: ubuntu:xenial
|
||||
dependencies:
|
||||
- build:ubuntu-18.04
|
||||
variables:
|
||||
LEVELDB_PKG: libleveldb1v5
|
||||
<<: *debpkg_template
|
||||
|
||||
##
|
||||
## Fedora
|
||||
##
|
||||
@ -260,4 +276,3 @@ package:win64:
|
||||
NO_PACKAGE: "1"
|
||||
WIN_ARCH: "x86_64"
|
||||
TOOLCHAIN_OUTPUT: "util/buildbot/toolchain_mingw64.cmake"
|
||||
|
||||
|
||||
@ -30,27 +30,27 @@ mkdir -p $libdir
|
||||
cd $builddir
|
||||
|
||||
# Get stuff
|
||||
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win32.zip \
|
||||
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win32.zip \
|
||||
-c -O $packagedir/irrlicht-$irrlicht_version.zip
|
||||
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip \
|
||||
[ -e $packagedir/zlib-$zlib_version.zip ] || wget https://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip \
|
||||
-c -O $packagedir/zlib-$zlib_version.zip
|
||||
[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip \
|
||||
[ -e $packagedir/libogg-$ogg_version.zip ] || wget https://minetest.kitsunemimi.pw/libogg-$ogg_version-win32.zip \
|
||||
-c -O $packagedir/libogg-$ogg_version.zip
|
||||
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip \
|
||||
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget https://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win32.zip \
|
||||
-c -O $packagedir/libvorbis-$vorbis_version.zip
|
||||
[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip \
|
||||
[ -e $packagedir/curl-$curl_version.zip ] || wget https://minetest.kitsunemimi.pw/curl-$curl_version-win32.zip \
|
||||
-c -O $packagedir/curl-$curl_version.zip
|
||||
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip \
|
||||
[ -e $packagedir/gettext-$gettext_version.zip ] || wget https://minetest.kitsunemimi.pw/gettext-$gettext_version-win32.zip \
|
||||
-c -O $packagedir/gettext-$gettext_version.zip
|
||||
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip \
|
||||
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget https://minetest.kitsunemimi.pw/freetype2-$freetype_version-win32.zip \
|
||||
-c -O $packagedir/freetype2-$freetype_version.zip
|
||||
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip \
|
||||
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget https://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win32.zip \
|
||||
-c -O $packagedir/sqlite3-$sqlite3_version.zip
|
||||
[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip \
|
||||
[ -e $packagedir/luajit-$luajit_version.zip ] || wget https://minetest.kitsunemimi.pw/luajit-$luajit_version-win32.zip \
|
||||
-c -O $packagedir/luajit-$luajit_version.zip
|
||||
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \
|
||||
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget https://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win32.zip \
|
||||
-c -O $packagedir/libleveldb-$leveldb_version.zip
|
||||
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped.zip \
|
||||
[ -e $packagedir/openal_stripped.zip ] || wget https://minetest.kitsunemimi.pw/openal_stripped.zip \
|
||||
-c -O $packagedir/openal_stripped.zip
|
||||
|
||||
# Extract stuff
|
||||
@ -72,7 +72,7 @@ cd $builddir
|
||||
if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then
|
||||
ln -s $EXISTING_MINETEST_DIR minetest
|
||||
else
|
||||
[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
|
||||
[ -d minetest ] && (cd minetest && git pull) || (git clone https://gitlab.com/luk3yx/minetest)
|
||||
fi
|
||||
cd minetest
|
||||
git_hash=$(git rev-parse --short HEAD)
|
||||
|
||||
@ -30,27 +30,27 @@ mkdir -p $libdir
|
||||
cd $builddir
|
||||
|
||||
# Get stuff
|
||||
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win64.zip \
|
||||
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win64.zip \
|
||||
-c -O $packagedir/irrlicht-$irrlicht_version.zip
|
||||
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip \
|
||||
[ -e $packagedir/zlib-$zlib_version.zip ] || wget https://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip \
|
||||
-c -O $packagedir/zlib-$zlib_version.zip
|
||||
[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip \
|
||||
[ -e $packagedir/libogg-$ogg_version.zip ] || wget https://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip \
|
||||
-c -O $packagedir/libogg-$ogg_version.zip
|
||||
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip \
|
||||
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget https://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip \
|
||||
-c -O $packagedir/libvorbis-$vorbis_version.zip
|
||||
[ -e $packagedir/curl-$curl_version.zip ] || wget http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip \
|
||||
[ -e $packagedir/curl-$curl_version.zip ] || wget https://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip \
|
||||
-c -O $packagedir/curl-$curl_version.zip
|
||||
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip \
|
||||
[ -e $packagedir/gettext-$gettext_version.zip ] || wget https://minetest.kitsunemimi.pw/gettext-$gettext_version-win64.zip \
|
||||
-c -O $packagedir/gettext-$gettext_version.zip
|
||||
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip \
|
||||
[ -e $packagedir/freetype2-$freetype_version.zip ] || wget https://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip \
|
||||
-c -O $packagedir/freetype2-$freetype_version.zip
|
||||
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip \
|
||||
[ -e $packagedir/sqlite3-$sqlite3_version.zip ] || wget https://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip \
|
||||
-c -O $packagedir/sqlite3-$sqlite3_version.zip
|
||||
[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip \
|
||||
[ -e $packagedir/luajit-$luajit_version.zip ] || wget https://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip \
|
||||
-c -O $packagedir/luajit-$luajit_version.zip
|
||||
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip \
|
||||
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget https://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip \
|
||||
-c -O $packagedir/libleveldb-$leveldb_version.zip
|
||||
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped64.zip \
|
||||
[ -e $packagedir/openal_stripped.zip ] || wget https://minetest.kitsunemimi.pw/openal_stripped64.zip \
|
||||
-c -O $packagedir/openal_stripped.zip
|
||||
|
||||
|
||||
@ -73,7 +73,7 @@ cd $builddir
|
||||
if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then
|
||||
ln -s $EXISTING_MINETEST_DIR minetest
|
||||
else
|
||||
[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
|
||||
[ -d minetest ] && (cd minetest && git pull) || (git clone https://gitlab.com/luk3yx/minetest)
|
||||
fi
|
||||
cd minetest
|
||||
git_hash=$(git rev-parse --short HEAD)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user