summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjak1 <mike.wollmann@gmail.com>2020-11-09 08:08:30 +0100
committerjak1 <mike.wollmann@gmail.com>2020-11-09 08:08:30 +0100
commit3ce831890c59ea5b95a9be08ca342271c51ad77f (patch)
tree1a2791e925931cbb1f802b12ca702c270cd13b68
parent3a807d5b6b969266ee3b95187495b84de9142bba (diff)
downloadappimg-builder-3ce831890c59ea5b95a9be08ca342271c51ad77f.tar.gz
appimg-builder-3ce831890c59ea5b95a9be08ca342271c51ad77f.tar.bz2
appimg-builder-3ce831890c59ea5b95a9be08ca342271c51ad77f.tar.xz
appimg-builder-3ce831890c59ea5b95a9be08ca342271c51ad77f.zip
added stage placeholders
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--build.sh8
-rw-r--r--install_dependencies.sh6
3 files changed, 15 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60d5971..02f77e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,19 @@
+.stages:
+ - build
+ - test
+ - deploy
+
BuildAppImage:
image: ubuntu:trusty
before_script:
- apt-get update -qq
- chmod +x install_dependencies.sh
- ./install_dependencies.sh
+ tags:
+ - docker
script:
+ - ls
- cd /builds/mana-launcher/mplusbuilder
- chmod +x build.sh
- chmod +x linuxdeploy-x86_64.AppImage
diff --git a/build.sh b/build.sh
index 8b9b2d0..bb057ae 100644
--- a/build.sh
+++ b/build.sh
@@ -7,13 +7,9 @@ mkdir manaplus
cd manaplus
-wget https://gitlab.com/manaplus/manaplus/-/archive/master/manaplus-master.tar.gz
+git clone git@gitlab.com:jak89_1/manaplus.git manaplus
-tar -xvzf manaplus-master.tar.gz
-
-ls
-
-cd manaplus-master
+cd manaplus
# compile
diff --git a/install_dependencies.sh b/install_dependencies.sh
index fbe3179..6713682 100644
--- a/install_dependencies.sh
+++ b/install_dependencies.sh
@@ -10,7 +10,11 @@ sh -c 'echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted
apt-get update -y -q
apt-get -y -q build-dep manaplus
-apt-get install -y -q g++ gcc xsel make autoconf automake appstream-index libappstream0 libappstream-dev autopoint gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps zlibc
+apt-get install -y -q g++ gcc git xsel make autoconf automake \
+ appstream-index libappstream0 libappstream-dev autopoint \
+ gettext libxml2-dev libcurl4-gnutls-dev libpng-dev libsdl-gfx1.2-dev \
+ libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev \
+ libsdl-ttf2.0-dev gdb valgrind netcat-openbsd procps zlibc
# AppImage - linuxdeploy
# seems to be not possible on docker because security restrictions