From df8db0eb962f75930e8f61228aaec2941142452b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 19 Oct 2017 17:35:56 +0300 Subject: Revert "Add testing repo and install gdb from it." This reverts commit 0006a26a5aec322253ddbb9b79562179e90cc4cc. --- .gitlab-ci.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f3f42b..ef94924 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,12 +131,11 @@ tinyxml2_2.2.0: manaplus_master: stage: manaplus script: - - ./.ci/addrepo.sh testing - ./.ci/install.sh gcc-7 g++-7 make autoconf automake autopoint gettext libcurl4-gnutls-dev libpng-dev zlib1g-dev libicu-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/testing valgrind netcat-openbsd procps + 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 --enable-libxml=tinyxml2 @@ -152,12 +151,11 @@ manaplus_master: manaplus_5.0.1: stage: manaplus script: - - ./.ci/addrepo.sh testing - ./.ci/install.sh gcc-7 g++-7 make autoconf automake autopoint gettext libcurl4-gnutls-dev libpng-dev zlib1g-dev libicu-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/testing valgrind netcat-openbsd procps + 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 --enable-libxml=tinyxml2 @@ -173,12 +171,11 @@ manaplus_5.0.1: manaplus_4.0.1: stage: manaplus script: - - ./.ci/addrepo.sh testing - ./.ci/install.sh gcc-7 g++-7 make autoconf automake autopoint gettext libcurl4-gnutls-dev libpng-dev zlib1g-dev libicu-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/testing valgrind netcat-openbsd procps + 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 --enable-libxml=tinyxml2 @@ -194,12 +191,11 @@ manaplus_4.0.1: manaplus_3.0.0: stage: manaplus script: - - ./.ci/addrepo.sh testing - ./.ci/install.sh gcc-7 g++-7 make autoconf automake autopoint gettext libcurl4-gnutls-dev libpng-dev zlib1g-dev libicu-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/testing valgrind netcat-openbsd procps + 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 --enable-libxml=tinyxml2 @@ -215,12 +211,11 @@ manaplus_3.0.0: manaplus_2.2.0: stage: manaplus script: - - ./.ci/addrepo.sh testing - ./.ci/install.sh gcc-7 g++-7 make autoconf automake autopoint gettext libcurl4-gnutls-dev libpng-dev zlib1g-dev libicu-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/testing valgrind netcat-openbsd procps + 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 --enable-libxml=tinyxml2 -- cgit v1.2.3-60-g2f50