summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-10-02 03:07:26 +0300
committerAndrei Karas <akaras@inbox.ru>2017-10-02 03:07:26 +0300
commit1abe0c7c474077684796f4d87a912103e9289659 (patch)
tree5772076b35675135f3b39a2655f08a44d373b23c
parent90d4afa1a23241662bc6782e69bec1f28eeb664e (diff)
downloadspm-1abe0c7c474077684796f4d87a912103e9289659.tar.gz
spm-1abe0c7c474077684796f4d87a912103e9289659.tar.bz2
spm-1abe0c7c474077684796f4d87a912103e9289659.tar.xz
spm-1abe0c7c474077684796f4d87a912103e9289659.zip
Due SDL2 default branch broken, switching to commit before issue was added to repository.
Using commit 11548:973151a33ec5
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bbbc1b..3d9751c 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 default _asan
+ - ./.ci/buildlib.sh SDL2 11548:973151a33ec5 _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 default
+ - ./.ci/buildlib.sh SDL2 11548:973151a33ec5
- 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