couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [05/20] jiffy commit: updated refs/heads/master to d3c00e1
Date Thu, 14 Jul 2016 20:41:49 GMT
Don't rely on an environment variable for Travis

The environment variable approach breaks other projects' Travis-CI runs
if they include other projects that depend on a different version of
PropEr.

Fixes: #106


Project: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/commit/75dd2591
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/tree/75dd2591
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/diff/75dd2591

Branch: refs/heads/master
Commit: 75dd259189b1c1134f4e0c0de667da3dc67590bf
Parents: 8a7c672
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Mon Aug 31 11:31:28 2015 -0500
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Mon Aug 31 11:36:08 2015 -0500

----------------------------------------------------------------------
 .travis.yml         | 1 +
 rebar.config.script | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/75dd2591/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2865a8a..fa26d15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: erlang
 notifications:
   email: paul.joseph.davis@gmail.com
+script: make check
 otp_release:
    - 17.5
    - 17.4

http://git-wip-us.apache.org/repos/asf/couchdb-jiffy/blob/75dd2591/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index e5f561d..8a0049d 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -16,7 +16,7 @@ Proper = [
 ConfigPath = filename:dirname(SCRIPT),
 DevMarker = filename:join([ConfigPath, ".jiffy.dev"]),
 
-case filelib:is_file(DevMarker) orelse os:getenv("TRAVIS") == "true" of
+case filelib:is_file(DevMarker) of
     true ->
         % Don't override existing dependencies
         Config0 = case lists:keyfind(deps, 1, CONFIG) of


Mime
View raw message