diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-28 03:16:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-28 03:16:56 +0300 |
| commit | 6f7fd79cce6709d3532d26b9d031bb01f95631fb (patch) | |
| tree | 1f67ece5843c952e97df76fdb7a90dde85091041 | |
| parent | 5241c64ab505949917f7eed9cfdd0e84eda90fd2 (diff) | |
| download | spm-6f7fd79cce6709d3532d26b9d031bb01f95631fb.tar.gz spm-6f7fd79cce6709d3532d26b9d031bb01f95631fb.tar.bz2 spm-6f7fd79cce6709d3532d26b9d031bb01f95631fb.tar.xz spm-6f7fd79cce6709d3532d26b9d031bb01f95631fb.zip | |
Fix switching branch in ci scripts.
| -rwxr-xr-x | .ci/buildlib.sh | 1 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/.ci/buildlib.sh b/.ci/buildlib.sh index bfcbeb7..18ece90 100755 --- a/.ci/buildlib.sh +++ b/.ci/buildlib.sh @@ -7,6 +7,7 @@ cd /usr/local/spm export installname="${1}_${2}" export envname="env" +export srcbranch="$2" ./.ci/run.sh ./getsrc.sh "$1" || exit 1 ./.ci/run.sh ./build.sh "$1" || exit 1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ff3192..0d7d915 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,10 +29,13 @@ test:commands1: - ./.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: @@ -45,8 +48,11 @@ test:commands2: - ./.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 |