Reenable wrong zlib version with debian stable.

1 files changed, 66 insertions, 44 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f097461..7462a41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,7 @@ variables:
     installname: zlib_v1.2.3
   <<: *job-artifacts
 
-.zlib_v1.2.3.9:
+zlib_v1.2.3.9:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -92,11 +92,12 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.3.9
   - grep "1.2.3" /usr/local/spm/bin/zlib_v1.2.3.9/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.3.9
   <<: *job-artifacts
 
-.zlib_v1.2.4:
+zlib_v1.2.4:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -104,11 +105,12 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.4
   - grep "1.2.4" /usr/local/spm/bin/zlib_v1.2.4/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.4
   <<: *job-artifacts
 
-.zlib_v1.2.4.5:
+zlib_v1.2.4.5:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -116,11 +118,12 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.4.5
   - grep "1.2.4" /usr/local/spm/bin/zlib_v1.2.4.5/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.4.5
   <<: *job-artifacts
 
-.zlib_v1.2.5:
+zlib_v1.2.5:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -128,12 +131,13 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.5
   - grep "1.2.5" /usr/local/spm/bin/zlib_v1.2.5/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.5
     retry: 1
   <<: *job-artifacts
 
-.zlib_v1.2.5.3:
+zlib_v1.2.5.3:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -141,11 +145,12 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.5.3
   - grep "1.2.5" /usr/local/spm/bin/zlib_v1.2.5.3/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.5.3
   <<: *job-artifacts
 
-.zlib_v1.2.6:
+zlib_v1.2.6:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -153,11 +158,12 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.6
   - grep "1.2.6" /usr/local/spm/bin/zlib_v1.2.6/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.6
   <<: *job-artifacts
 
-.zlib_v1.2.6.1:
+zlib_v1.2.6.1:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -165,11 +171,12 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.6.1
   - grep "1.2.6" /usr/local/spm/bin/zlib_v1.2.6.1/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.6.1
   <<: *job-artifacts
 
-.zlib_v1.2.7:
+zlib_v1.2.7:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -177,11 +184,12 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.7
   - grep "1.2.7" /usr/local/spm/bin/zlib_v1.2.7/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.7
   <<: *job-artifacts
 
-.zlib_v1.2.7.1:
+zlib_v1.2.7.1:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -189,11 +197,12 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.7.1
   - grep "1.2.7" /usr/local/spm/bin/zlib_v1.2.7.1/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.7.1
   <<: *job-artifacts
 
-.zlib_v1.2.7.3:
+zlib_v1.2.7.3:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -201,11 +210,12 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.7.3
   - grep "1.2.7" /usr/local/spm/bin/zlib_v1.2.7.3/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.7.3
   <<: *job-artifacts
 
-.zlib_v1.2.8:
+zlib_v1.2.8:
   stage: build
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
@@ -213,6 +223,7 @@ variables:
   - ./.ci/buildlib.sh zlib v1.2.8
   - grep "1.2.8" /usr/local/spm/bin/zlib_v1.2.8/lib/pkgconfig/zlib.pc
   - ./.ci/copyfinal.sh
+  image: debian:stretch
   variables:
     installname: zlib_v1.2.8
   <<: *job-artifacts
@@ -382,19 +393,20 @@ zlib_develop:
     - zlib_v1.2.3
   <<: *job-artifacts
 
-.manaplus_v1.2.3.9:
+manaplus_v1.2.3.9:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.3.9
@@ -403,19 +415,20 @@ zlib_develop:
     - zlib_v1.2.3.9
   <<: *job-artifacts
 
-.manaplus_v1.2.4:
+manaplus_v1.2.4:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.4
@@ -424,19 +437,20 @@ zlib_develop:
     - zlib_v1.2.4
   <<: *job-artifacts
 
-.manaplus_v1.2.4.5:
+manaplus_v1.2.4.5:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.4.5
@@ -445,19 +459,20 @@ zlib_develop:
     - zlib_v1.2.4.5
   <<: *job-artifacts
 
-.manaplus_v1.2.5:
+manaplus_v1.2.5:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.5
@@ -466,19 +481,20 @@ zlib_develop:
     - zlib_v1.2.5
   <<: *job-artifacts
 
-.manaplus_v1.2.5.3:
+manaplus_v1.2.5.3:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.5.3
@@ -487,19 +503,20 @@ zlib_develop:
     - zlib_v1.2.5.3
   <<: *job-artifacts
 
-.manaplus_v1.2.6:
+manaplus_v1.2.6:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.6
@@ -508,19 +525,20 @@ zlib_develop:
     - zlib_v1.2.6
   <<: *job-artifacts
 
-.manaplus_v1.2.6.1:
+manaplus_v1.2.6.1:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.6.1
@@ -529,19 +547,20 @@ zlib_develop:
     - zlib_v1.2.6.1
   <<: *job-artifacts
 
-.manaplus_v1.2.7:
+manaplus_v1.2.7:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.7
@@ -550,19 +569,20 @@ zlib_develop:
     - zlib_v1.2.7
   <<: *job-artifacts
 
-.manaplus_v1.2.7.1:
+manaplus_v1.2.7.1:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.7.1
@@ -571,19 +591,20 @@ zlib_develop:
     - zlib_v1.2.7.1
   <<: *job-artifacts
 
-.manaplus_v1.2.7.3:
+manaplus_v1.2.7.3:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.7.3
@@ -592,19 +613,20 @@ zlib_develop:
     - zlib_v1.2.7.3
   <<: *job-artifacts
 
-.manaplus_v1.2.8:
+manaplus_v1.2.8:
   stage: manaplus
   script:
-  - ./.ci/install.sh gcc-7 g++-7 
+  - ./.ci/install.sh gcc-6 g++-6 
                      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
                      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/jobs/gcc6.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
+  image: debian:stretch
   variables:
     LIBNAME: zlib
     LIBVERSION: v1.2.8