Merge branch 'develop'

ansiblebit · Sep 15, 2017 · bc19672 · bc19672
2 parents e0e72cf + 51d1fd2
commit bc19672
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 *.retry
-**/dependencies/*
+**/roles/*
 
 # Created by https://www.gitignore.io
 

diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
 
 before_cache:
-  - rm -f ${HOME}/.cache/pip/log/debug.log
+  - "find ${HOME}/.pip -name log -o -name __pycache__ -type d | xargs -I {} rm -rf {}"
 
 cache:
   directories:

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014, ansiblebit
+Copyright (c) 2014-2017, ansiblebit
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/tests/setup.sh b/tests/setup.sh
@@ -29,5 +29,5 @@ test -s ${DIR}/../requirements.yml \
     && ansible-galaxy install \
         --force \
         -r ${DIR}/../requirements.yml \
-        --roles-path=${DIR}/dependencies \
+        --roles-path=${DIR}/roles \
     || true
diff --git a/tests/test.yml b/tests/test.yml
@@ -7,6 +7,7 @@
 
   tasks:
     - raw: sudo apt-get update -qq && sudo apt-get install -qq python2.7
+      changed_when: no
       when: playbook_python2 is defined and
             playbook_python2