diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-28 04:59:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-28 04:59:51 +0300 |
| commit | 7b5ef3419de853d852c887b50a8427532b4979f4 (patch) | |
| tree | dcd35e1eb0e762e475bf34c51f6ec810c2eaa9aa /.gitlab-ci.yml | |
| parent | dd8d1e42f08740c24f66a55be58b1030f2bf5158 (diff) | |
| parent | 925f362b0374d78c755185b2f4d3ecef87b5db7b (diff) | |
| download | spm-7b5ef3419de853d852c887b50a8427532b4979f4.tar.gz spm-7b5ef3419de853d852c887b50a8427532b4979f4.tar.bz2 spm-7b5ef3419de853d852c887b50a8427532b4979f4.tar.xz spm-7b5ef3419de853d852c887b50a8427532b4979f4.zip | |
Merge branch 'master' into zlib
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4251a4e..38302ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ variables: # self tests -test:commands: +test:commands1: stage: test script: - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext @@ -28,10 +28,33 @@ test:commands: - ls src/zlib - ./.ci/run.sh ./build.sh zlib - ls bin/zlib + - ls tmp/zlib + - grep "1.2.10" ./bin/zlib/lib/pkgconfig/zlib.pc - ./.ci/run.sh ./clean.sh zlib - mkdir bin/zlib - ./.ci/run.sh ./clean.sh zlib - ./.ci/run.sh ./updatesrc.sh zlib + variables: + srcbranch: v1.2.10 + <<: *job-artifacts + +test:commands2: + stage: test + script: + - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext + zlib1g-dev libtool + - ./.ci/run.sh ./getsrc.sh curl + - ls src/curl + - ./.ci/run.sh ./build.sh curl + - ls bin/curl + - ls tmp/curl + - grep "7.51" ./bin/curl/lib/pkgconfig/libcurl.pc + - ./.ci/run.sh ./clean.sh curl + - mkdir bin/curl + - ./.ci/run.sh ./clean.sh curl + - ./.ci/run.sh ./updatesrc.sh curl + variables: + srcbranch: curl-7_51_0 <<: *job-artifacts # zlib builds @@ -162,6 +185,7 @@ zlib_v1.2.10: - ./.ci/buildlib.sh zlib v1.2.10 <<: *job-artifacts + zlib_v1.2.11: stage: build script: |