diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-03 04:24:42 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-03 04:24:42 +0300 |
| commit | adf33f0e7bfacf08ee89d36f46d7b14da40aaae7 (patch) | |
| tree | 6222a78ce1c2740f1081a0f34e54b1894aaa1669 /.gitlab-ci.yml | |
| parent | c5d9bbc47405f7c21c7ab57326d9fc68cbbf3128 (diff) | |
| download | spm-adf33f0e7bfacf08ee89d36f46d7b14da40aaae7.tar.gz spm-adf33f0e7bfacf08ee89d36f46d7b14da40aaae7.tar.bz2 spm-adf33f0e7bfacf08ee89d36f46d7b14da40aaae7.tar.xz spm-adf33f0e7bfacf08ee89d36f46d7b14da40aaae7.zip | |
Update .gitlab-ci.yml for new ci scripts.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d172b76..e67cb0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,27 +60,43 @@ test:commands2: SDL_SDL-1.2: stage: build script: - - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext \ + - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev + libfreetype6-dev + - ./.ci/copyspm.sh - ./.ci/buildlib.sh SDL SDL-1.2 - - ./env/runenv.sh ./.ci/buildlib.sh SDL_gfx master - - ./env/runenv.sh ./.ci/buildlib.sh SDL_image SDL-1.2 - - ./env/runenv.sh ./.ci/buildlib.sh SDL_mixer SDL-1.2 - - ./env/runenv.sh ./.ci/buildlib.sh SDL_ttf SDL-1.2 + - ${runenvtool} ./.ci/buildlib.sh zlib v1.2.9 + - ${runenvtool} ./.ci/buildlib.sh SDL_gfx master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master + - ${runenvtool} ./.ci/buildlib.sh SDL_image SDL-1.2 + - ${runenvtool} ./.ci/buildlib.sh SDL_mixer SDL-1.2 + - ${runenvtool} ./.ci/buildlib.sh SDL_net SDL-1.2 + - ${runenvtool} ./.ci/buildlib.sh SDL_ttf SDL-1.2 + - ./.ci/copyfinal.sh - grep "1.2" /usr/local/spm/bin/SDL_SDL-1.2/lib/pkgconfig/sdl.pc variables: installname: SDL_SDL-1.2 + runenvtool: /usr/local/spm/env/run${installname}.sh + runenvtoolz: /usr/local/spm/env/runzlib_v1.2.9.sh <<: *job-artifacts SDL_default: stage: build script: - - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext \ + - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev + libfreetype6-dev + - ./.ci/copyspm.sh - ./.ci/buildlib.sh SDL default - - ./env/runenv.sh ./.ci/buildlib.sh SDL_image default - - ./env/runenv.sh ./.ci/buildlib.sh SDL_mixer default - - ./env/runenv.sh ./.ci/buildlib.sh SDL_ttf default + - ${runenvtool} ./.ci/buildlib.sh zlib v1.2.9 + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master + - ${runenvtool} ./.ci/buildlib.sh SDL_image default + - ${runenvtool} ./.ci/buildlib.sh SDL_mixer default + - ${runenvtool} ./.ci/buildlib.sh SDL_net default + - ${runenvtool} ./.ci/buildlib.sh SDL_ttf default + - ./.ci/copyfinal.sh variables: installname: SDL_default + runenvtool: /usr/local/spm/env/run${installname}.sh + runenvtoolz: /usr/local/spm/env/runzlib_v1.2.9.sh <<: *job-artifacts |