You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2017/01/13 07:19:10 UTC
[1/2] celix git commit: CELIX-387: Fixes typo in Andriod build
Repository: celix
Updated Branches:
refs/heads/develop 2320ddaff -> f0fb4fee9
CELIX-387: Fixes typo in Andriod build
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/30492193
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/30492193
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/30492193
Branch: refs/heads/develop
Commit: 304921930d5dbdc3bf3aa8ebd4953b175acf99d4
Parents: 2320dda
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Thu Jan 12 19:32:48 2017 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Thu Jan 12 19:32:48 2017 +0100
----------------------------------------------------------------------
Dockerfile.Android | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/30492193/Dockerfile.Android
----------------------------------------------------------------------
diff --git a/Dockerfile.Android b/Dockerfile.Android
index dc12367..6495eb8 100644
--- a/Dockerfile.Android
+++ b/Dockerfile.Android
@@ -87,7 +87,7 @@ RUN curl -L -O http://downloads.sourceforge.net/libuuid/libuuid-1.0.3.tar.gz &&
# zlib
-RUN curl -L -O http://zlib.net/zlib-1.2.10.tar.gz &&
+RUN curl -L -O http://zlib.net/zlib-1.2.10.tar.gz && \
tar -xvzf zlib-*.tar.gz && \
cd zlib-* && \
./configure --prefix=/build/output/zlib && make && make install
[2/2] celix git commit: CELIX-387: Disables osx in travis cfg.
Posted by pn...@apache.org.
CELIX-387: Disables osx in travis cfg.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/f0fb4fee
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/f0fb4fee
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/f0fb4fee
Branch: refs/heads/develop
Commit: f0fb4fee9b621dbe888b372a84ad59ce8278c094
Parents: 3049219
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Fri Jan 13 08:24:10 2017 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Fri Jan 13 08:24:10 2017 +0100
----------------------------------------------------------------------
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/f0fb4fee/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 0fb6ede..0179761 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
sudo: required
dist: trusty
-osx_image: xcode8.2
+#osx_image: xcode8.2
language: c
os:
- linux
- - osx
+ # - osx
compiler:
- gcc