diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-10-02 22:27:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-10-02 22:27:41 +0300 |
| commit | 6ee6d3e54d9ff3cd46dcfeb969c2364aeb357e85 (patch) | |
| tree | d9d6d8e2d4e25ffe4e14a128fe73fee047a05a1b | |
| parent | 1abe0c7c474077684796f4d87a912103e9289659 (diff) | |
| download | spm-6ee6d3e54d9ff3cd46dcfeb969c2364aeb357e85.tar.gz spm-6ee6d3e54d9ff3cd46dcfeb969c2364aeb357e85.tar.bz2 spm-6ee6d3e54d9ff3cd46dcfeb969c2364aeb357e85.tar.xz spm-6ee6d3e54d9ff3cd46dcfeb969c2364aeb357e85.zip | |
Revert "Due SDL2 default branch broken, switching to commit before issue was added to repository."
This reverts commit 1abe0c7c474077684796f4d87a912103e9289659.
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files 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 |