From 5434c1492f2ebcfa867320d5e7bd5a30407ca008 Mon Sep 17 00:00:00 2001
From: diosmosis <benakamoorthi@fastmail.fm>
Date: Thu, 28 Aug 2014 17:56:24 -0700
Subject: [PATCH] Add extra instructions regarding how to edit travis.yml.twig
file.
---
.travis.yml | 8 +++++++-
plugins/CoreConsole/templates/travis.yml.twig | 10 +++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ee917b3fbc..b951418c6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
# do not edit this file manually, instead run the generate:travis-yml console command
-# if you are a Piwik core developer, edit this template file to auto generate the travis.yml: https://github.com/piwik/piwik/blob/master/plugins/CoreConsole/templates/travis.yml.twig
+# if you are a Piwik core developer, edit this template file to auto generate the .travis.yml: https://github.com/piwik/piwik/blob/master/plugins/CoreConsole/templates/travis.yml.twig
+
+# when modifying this file, please consider whether your changes should apply to plugin .travis.yml files. if not, check whether the pluginName twig var is empty,
+# otherwise your changes will be synced with every plugin that uses an auto generated .travis.yml
+
+# also please test generation before committing by running ./console generate:travis-yml --core and ./console generate:travis-yml --plugin=CustomAlerts
+# and making sure the .travis.yml files are changed correctly
language: php
diff --git a/plugins/CoreConsole/templates/travis.yml.twig b/plugins/CoreConsole/templates/travis.yml.twig
index 1add249a5b..5829c4da58 100644
--- a/plugins/CoreConsole/templates/travis.yml.twig
+++ b/plugins/CoreConsole/templates/travis.yml.twig
@@ -1,5 +1,13 @@
# do not edit this file manually, instead run the generate:travis-yml console command
-# if you are a Piwik core developer, edit this template file to auto generate the travis.yml: https://github.com/piwik/piwik/blob/master/plugins/CoreConsole/templates/travis.yml.twig
+{% if pluginName is empty %}
+# if you are a Piwik core developer, edit this template file to auto generate the .travis.yml: https://github.com/piwik/piwik/blob/master/plugins/CoreConsole/templates/travis.yml.twig
+
+# when modifying this file, please consider whether your changes should apply to plugin .travis.yml files. if not, check whether the pluginName twig var is empty,
+# otherwise your changes will be synced with every plugin that uses an auto generated .travis.yml
+
+# also please test generation before committing by running ./console generate:travis-yml --core and ./console generate:travis-yml --plugin=CustomAlerts
+# and making sure the .travis.yml files are changed correctly
+{% endif %}
language: php
--
GitLab