From 80c12650750c8f81bbde1588700361715524d7cc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 26 Jan 2017 01:49:28 +0300
Subject: Remove zlib builds from .gitlab-ci.yml

---
 .gitlab-ci.yml | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd135da..67a53ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,26 +33,3 @@ test:commands:
   - ./.ci/run.sh ./clean.sh zlib
   - ./.ci/run.sh ./updatesrc.sh zlib
   <<: *job-artifacts
-
-# zlib builds
-
-zlib_v1.2.9:
-  stage: build
-  script:
-  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
-  - ./.ci/buildlib.sh zlib v1.2.9
-  <<: *job-artifacts
-
-zlib_v1.2.10:
-  stage: build
-  script:
-  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
-  - ./.ci/buildlib.sh zlib v1.2.10
-  <<: *job-artifacts
-
-zlib_v1.2.11:
-  stage: build
-  script:
-  - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
-  - ./.ci/buildlib.sh zlib v1.2.11
-  <<: *job-artifacts
-- 
cgit v1.2.3-70-g09d2


From ad3d79e9b10dfcd53d9622169834e04b916a6d15 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 26 Jan 2017 05:49:35 +0300
Subject: Add ci test for in source tree packages compilation.

---
 .gitlab-ci.yml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67a53ff..1ff3192 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,8 +28,25 @@ test:commands:
   - ls src/zlib
   - ./.ci/run.sh ./build.sh zlib
   - ls bin/zlib
+  - ls tmp/zlib
   - ./.ci/run.sh ./clean.sh zlib
   - mkdir bin/zlib
   - ./.ci/run.sh ./clean.sh zlib
   - ./.ci/run.sh ./updatesrc.sh zlib
   <<: *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
+  - ./.ci/run.sh ./clean.sh curl
+  - mkdir bin/curl
+  - ./.ci/run.sh ./clean.sh curl
+  - ./.ci/run.sh ./updatesrc.sh curl
+  <<: *job-artifacts
-- 
cgit v1.2.3-70-g09d2


From 6f7fd79cce6709d3532d26b9d031bb01f95631fb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 28 Jan 2017 03:16:56 +0300
Subject: Fix switching branch in ci scripts.

---
 .ci/buildlib.sh | 1 +
 .gitlab-ci.yml  | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to '.gitlab-ci.yml')

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
-- 
cgit v1.2.3-70-g09d2