You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by ba...@apache.org on 2015/12/25 23:06:04 UTC

[3/6] couchdb-ci git commit: make all check dist

make all check dist


Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/4b98eed7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/4b98eed7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/4b98eed7

Branch: refs/heads/master
Commit: 4b98eed7941cbd6f60a821a9ca90c4bee53f3424
Parents: 9bdbc07
Author: Bastian Krol <ba...@web.de>
Authored: Tue Dec 22 18:08:03 2015 +0100
Committer: Bastian Krol <ba...@web.de>
Committed: Tue Dec 22 18:08:15 2015 +0100

----------------------------------------------------------------------
 ansible/roles/ubuntu-worker/files/build-ci.sh   |  4 ++--
 .../roles/ubuntu-worker/tasks/dependencies.yml  | 11 ++++++++---
 run-build-in-container.sh                       | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/4b98eed7/ansible/roles/ubuntu-worker/files/build-ci.sh
----------------------------------------------------------------------
diff --git a/ansible/roles/ubuntu-worker/files/build-ci.sh b/ansible/roles/ubuntu-worker/files/build-ci.sh
index f216c25..f6fe18a 100755
--- a/ansible/roles/ubuntu-worker/files/build-ci.sh
+++ b/ansible/roles/ubuntu-worker/files/build-ci.sh
@@ -22,5 +22,5 @@ set -e
 cd /usr/src/couchdb
 git reset --hard
 git pull
-./configure
-make
+./configure --with-curl
+make all check dist

http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/4b98eed7/ansible/roles/ubuntu-worker/tasks/dependencies.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/ubuntu-worker/tasks/dependencies.yml b/ansible/roles/ubuntu-worker/tasks/dependencies.yml
index c513096..fad6335 100644
--- a/ansible/roles/ubuntu-worker/tasks/dependencies.yml
+++ b/ansible/roles/ubuntu-worker/tasks/dependencies.yml
@@ -53,6 +53,14 @@
   - libicu-dev
   - libmozjs185-dev
 
+# required for make check and make dialyze
+- name: install packages required to build CouchDB
+  apt: name={{item}} state=present install_recommends=no
+  with_items:
+  - erlang-eunit
+  - erlang-dialyzer
+  - shunit2
+
 # required for make docs
 - name: install packages required to build CouchDB
   apt: name={{item}} state=present install_recommends=no
@@ -66,9 +74,6 @@
   - texinfo
 
 # More packages found in klaemo's Dockerfile... not sure if required, apparently not?
-# - erlang-base-hipe
-# - erlang-dialyzer
-# - erlang-eunit
 # - erlang-manpages
 # - libnspr4
 # - libnspr4-0d

http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/4b98eed7/run-build-in-container.sh
----------------------------------------------------------------------
diff --git a/run-build-in-container.sh b/run-build-in-container.sh
new file mode 100755
index 0000000..4c3bbc7
--- /dev/null
+++ b/run-build-in-container.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing,
+#   software distributed under the License is distributed on an
+#   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#   KIND, either express or implied.  See the License for the
+#   specific language governing permissions and limitations
+#   under the License.
+
+docker run couchdb-build-ubuntu-14.04-erlang-18.2