summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-03-05 06:35:38 +0300
committerAndrei Karas <akaras@inbox.ru>2019-03-05 06:35:38 +0300
commit398fab91ac641fc0430b6045ee67339c094511d0 (patch)
tree49ec2447ad288424bb0c36fc892c9ee33f6b4cb0
parent9253bd60eedaa7c027e35fcde7c0c14d00bfb0d7 (diff)
downloadmanaplus-398fab91ac641fc0430b6045ee67339c094511d0.tar.gz
manaplus-398fab91ac641fc0430b6045ee67339c094511d0.tar.bz2
manaplus-398fab91ac641fc0430b6045ee67339c094511d0.tar.xz
manaplus-398fab91ac641fc0430b6045ee67339c094511d0.zip
Fix jemalloc package name in ci malloc branch
-rw-r--r--tools/ci/branches/ci_malloc/.gitlab-ci.yml24
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/ci/branches/ci_malloc/.gitlab-ci.yml b/tools/ci/branches/ci_malloc/.gitlab-ci.yml
index 3a2e07eef..ace0f93a3 100644
--- a/tools/ci/branches/ci_malloc/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_malloc/.gitlab-ci.yml
@@ -26,8 +26,8 @@ gcc-8_tests_jmalloc:
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 valgrind libjemalloc1
- MALLOC: /usr/lib/x86_64-linux-gnu/libjemalloc.so.1
+ git valgrind libjemalloc2
+ MALLOC: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
tags:
- docker
@@ -38,14 +38,14 @@ gcc-8_tests_jmalloc_i386:
- ./tools/ci/scripts/patchsdl1.sh
- LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
<<: *job-push
- image: vicamo/debian:sid-i386
+ image: i386/debian:unstable
variables:
PACKAGES: gcc-8 g++-8
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 valgrind libjemalloc1
- MALLOC: /usr/lib/i386-linux-gnu/libjemalloc.so.1
+ git valgrind libjemalloc2
+ MALLOC: /usr/lib/i386-linux-gnu/libjemalloc.so.2
tags:
- docker
@@ -60,8 +60,8 @@ gcc-8_tests_jmalloc_sdl2:
make autoconf automake autopoint gettext
libxml2-dev libcurl4-gnutls-dev libpng-dev
libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
- git valgrind libjemalloc1
- MALLOC: /usr/lib/x86_64-linux-gnu/libjemalloc.so.1
+ git valgrind libjemalloc2
+ MALLOC: /usr/lib/x86_64-linux-gnu/libjemalloc.so.2
tags:
- docker
@@ -71,14 +71,14 @@ gcc-8_tests_jmalloc_sdl2_i386:
- ls ${MALLOC}
- LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
<<: *job-push
- image: vicamo/debian:sid-i386
+ image: i386/debian:unstable
variables:
PACKAGES: gcc-8 g++-8
make autoconf automake autopoint gettext
libxml2-dev libcurl4-gnutls-dev libpng-dev
libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
- git valgrind libjemalloc1
- MALLOC: /usr/lib/i386-linux-gnu/libjemalloc.so.1
+ git valgrind libjemalloc2
+ MALLOC: /usr/lib/i386-linux-gnu/libjemalloc.so.2
tags:
- docker
@@ -103,7 +103,7 @@ gcc-8_tests_tcmalloc_i386:
- ./tools/ci/scripts/patchsdl1.sh
- ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaplusgame
<<: *job-push
- image: vicamo/debian:sid-i386
+ image: i386/debian:unstable
variables:
PACKAGES: gcc-8 g++-8
make autoconf automake autopoint gettext
@@ -132,7 +132,7 @@ gcc-8_tests_tcmalloc_sdl2_i386:
script:
- ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --with-sdl2 --without-dyecmd --without-manaplusgame
<<: *job-push
- image: vicamo/debian:sid-i386
+ image: i386/debian:unstable
variables:
PACKAGES: gcc-8 g++-8
make autoconf automake autopoint gettext