Add builds with manaplus.

1 files changed, 98 insertions, 3 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c99a19d..0e332ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,12 @@
 stages:
   - test
   - build
+  - manaplus
 
 before_script:
   - uname -a
-  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext pkg-config
-                     zlib1g-dev libtool libicu-dev
+  - cat /etc/os-release
+  - mkdir logs || true
 
 image: debian:unstable
 variables:
@@ -25,6 +26,8 @@ variables:
 test:commands1:
   stage: test
   script:
+  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext pkg-config
+                     zlib1g-dev libtool libicu-dev
   - ./.ci/runretry.sh ./getsrc.sh zlib
   - ls src/zlib
   - ./.ci/run.sh ./build.sh zlib
@@ -42,6 +45,8 @@ test:commands1:
 test:commands2:
   stage: test
   script:
+  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext pkg-config
+                     zlib1g-dev libtool libicu-dev
   - ./.ci/runretry.sh ./getsrc.sh curl
   - ls src/curl
   - ./.ci/run.sh ./build.sh curl
@@ -59,6 +64,8 @@ test:commands2:
 libxml2_v2.9.4:
   stage: build
   script:
+  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext pkg-config
+                     zlib1g-dev libtool libicu-dev
   - ./.ci/copyspm.sh
   - ./.ci/buildlib.sh libxml2 v2.9.4
   - grep "2.9.4" /usr/local/spm/bin/libxml2_v2.9.4/lib/pkgconfig/libxml-2.0.pc
@@ -70,6 +77,8 @@ libxml2_v2.9.4:
 libxml2_v2.9.0:
   stage: build
   script:
+  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext pkg-config
+                     zlib1g-dev libtool libicu-dev
   - ./.ci/copyspm.sh
   - ./.ci/buildlib.sh libxml2 v2.9.0
   - grep "2.9.0" /usr/local/spm/bin/libxml2_v2.9.0/lib/pkgconfig/libxml-2.0.pc
@@ -78,9 +87,12 @@ libxml2_v2.9.0:
     installname: libxml2_v2.9.0
   <<: *job-artifacts
 
-libxml2_v2.8.0:
+# conflict with system libxml2 in gettext
+.libxml2_v2.8.0:
   stage: build
   script:
+  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext pkg-config
+                     zlib1g-dev libtool libicu-dev
   - ./.ci/copyspm.sh
   - ./.ci/buildlib.sh libxml2 v2.8.0
   - grep "2.8.0" /usr/local/spm/bin/libxml2_v2.8.0/lib/pkgconfig/libxml-2.0.pc
@@ -92,6 +104,8 @@ libxml2_v2.8.0:
 libxml2_master:
   stage: build
   script:
+  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext pkg-config
+                     zlib1g-dev libtool libicu-dev
   - ./.ci/copyspm.sh
   - ./.ci/buildlib.sh libxml2 master
   - grep "2" /usr/local/spm/bin/libxml2_master/lib/pkgconfig/libxml-2.0.pc
@@ -99,3 +113,84 @@ libxml2_master:
   variables:
     installname: libxml2_master
   <<: *job-artifacts
+
+
+manaplus_v2.9.4:
+  stage: manaplus
+  script:
+  - ./.ci/install.sh gcc-7 g++-7 
+                     make autoconf automake autopoint gettext 
+                     libpng-dev zlib1g-dev 
+                     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+                     git wget unzip gdb valgrind netcat-openbsd procps
+  - ./.ci/clonesrc.sh
+  - cd cloned
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh
+  variables:
+    LIBNAME: libxml2
+    LIBVERSION: v2.9.4
+  dependencies:
+    - libxml2_v2.9.4
+  <<: *job-artifacts
+
+manaplus_v2.9.0:
+  stage: manaplus
+  script:
+  - ./.ci/install.sh gcc-7 g++-7 
+                     make autoconf automake autopoint gettext 
+                     libpng-dev zlib1g-dev 
+                     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+                     git wget unzip gdb valgrind netcat-openbsd procps
+  - ./.ci/clonesrc.sh
+  - cd cloned
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh
+  variables:
+    LIBNAME: libxml2
+    LIBVERSION: v2.9.0
+  dependencies:
+    - libxml2_v2.9.0
+  <<: *job-artifacts
+
+manaplus_v2.8.0:
+  stage: manaplus
+  script:
+  - ./.ci/install.sh gcc-7 g++-7 
+                     make autoconf automake autopoint gettext 
+                     libpng-dev zlib1g-dev 
+                     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+                     git wget unzip gdb valgrind netcat-openbsd procps
+  - ./.ci/clonesrc.sh
+  - cd cloned
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh
+  variables:
+    LIBNAME: libxml2
+    LIBVERSION: v2.8.0
+  dependencies:
+    - libxml2_v2.8.0
+  <<: *job-artifacts
+
+manaplus_master:
+  stage: manaplus
+  script:
+  - ./.ci/install.sh gcc-7 g++-7 
+                     make autoconf automake autopoint gettext 
+                     libpng-dev zlib1g-dev 
+                     libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+                     git wget unzip gdb valgrind netcat-openbsd procps
+  - ./.ci/clonesrc.sh
+  - cd cloned
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
+  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh
+  variables:
+    LIBNAME: libxml2
+    LIBVERSION: master
+  dependencies:
+    - libxml2_master
+  <<: *job-artifacts