summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--build.sh4
-rw-r--r--install_dependencies.sh16
3 files changed, 21 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee57ec5..19f4b5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,11 @@
BuildAppImage:
image: ubuntu:trusty
+ before_script:
+ - apt-get update -qq
+ - chmod +x install_dependencies.sh
+ - ./install_dependencies.sh
+
script:
- - apt-get update -qq && apt install -y libfuse2 g++ gcc xsel wget make autoconf automake 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
- cd /builds/mana-launcher/mplusbuilder
- chmod +x build.sh
- chmod +x linuxdeploy-x86_64.AppImage
diff --git a/build.sh b/build.sh
index 21e4a6f..50e74fe 100644
--- a/build.sh
+++ b/build.sh
@@ -1,9 +1,6 @@
#!/bin/bash
set -e
-# Install dependencies
-#apt-get -y build-dep manaplus
-
# clone repo
mkdir manaplus
@@ -17,7 +14,6 @@ tar -xvzf manaplus-master.tar.gz
ls
cd manaplus-master
-autoreconf -i
# compile
diff --git a/install_dependencies.sh b/install_dependencies.sh
new file mode 100644
index 0000000..ba71221
--- /dev/null
+++ b/install_dependencies.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -e
+
+# general
+apt-get install -y wget
+
+# manaplus
+
+sh -c 'echo "deb-src http://de.archive.ubuntu.com/ubuntu trusty main restricted universe multiverse" >> /etc/apt/sources.list'
+apt-get update -y
+apt-get -y build-dep manaplus
+
+# apt-get install -y g++ gcc xsel make autoconf automake 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
+apt-get install -y libfuse2 \ No newline at end of file