diff options
| author | jak1 <mike.wollmann@gmail.com> | 2020-11-10 09:25:12 +0000 |
|---|---|---|
| committer | jak1 <mike.wollmann@gmail.com> | 2020-11-10 09:25:12 +0000 |
| commit | 505374f4545b0520b63b83d68f172a9ffcbc0a53 (patch) | |
| tree | 0d2affe4592506cf3f652a977b5d8110c6224df6 | |
| parent | 3a807d5b6b969266ee3b95187495b84de9142bba (diff) | |
| parent | 460642606f87ba466924ebc0fdfd1b3e09bedc03 (diff) | |
| download | appimg-builder-505374f4545b0520b63b83d68f172a9ffcbc0a53.tar.gz appimg-builder-505374f4545b0520b63b83d68f172a9ffcbc0a53.tar.bz2 appimg-builder-505374f4545b0520b63b83d68f172a9ffcbc0a53.tar.xz appimg-builder-505374f4545b0520b63b83d68f172a9ffcbc0a53.zip | |
Merge branch 'ci_test' into 'master'
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | build.sh | 8 | ||||
| -rw-r--r-- | install_dependencies.sh | 6 |
3 files changed, 16 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60d5971..752c5e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,20 @@ +.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: - - cd /builds/mana-launcher/mplusbuilder + - ls /builds/ + - cd /builds/jak89_1/appimg-builder - chmod +x build.sh - chmod +x linuxdeploy-x86_64.AppImage - ./linuxdeploy-x86_64.AppImage --appimage-extract @@ -7,13 +7,9 @@ mkdir manaplus cd manaplus -wget https://gitlab.com/manaplus/manaplus/-/archive/master/manaplus-master.tar.gz +git clone https://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 |