From 6ee6d3e54d9ff3cd46dcfeb969c2364aeb357e85 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 2 Oct 2017 22:27:41 +0300 Subject: Revert "Due SDL2 default branch broken, switching to commit before issue was added to repository." This reverts commit 1abe0c7c474077684796f4d87a912103e9289659. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d9751c..4bbbc1b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ test:commands2: libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev - ./.ci/copyspm.sh - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.4 - - ./.ci/buildlib.sh SDL2 11548:973151a33ec5 _asan + - ./.ci/buildlib.sh SDL2 default _asan - cp /usr/local/spm/env/runSDL2_default_asan.sh /usr/local/spm/env/runSDL_default_asan.sh - ${runenvtool} ./.ci/buildlib.sh zlib master - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master @@ -198,7 +198,7 @@ SDL_default: - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev - ./.ci/copyspm.sh - - ./.ci/buildlib.sh SDL2 11548:973151a33ec5 + - ./.ci/buildlib.sh SDL2 default - cp /usr/local/spm/env/runSDL2_default.sh /usr/local/spm/env/runSDL_default.sh - ${runenvtool} ./.ci/buildlib.sh zlib master - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master -- cgit v1.2.3-60-g2f50