jenkins-bot has submitted this change and it was merged.
Change subject: Stop git from tracking .idea (PHPStorm) directory
......................................................................
Stop git from tracking .idea (PHPStorm) directory
* move .idea defaults to support/idea-dist
* add .idea to gitignore
* create .idea from vagrant when the box is first started
Bug: T85976
Change-Id: Ie90b3e3a34d0ae53c8523ef351b69bb70cf8ba0e
---
M .gitignore
M puppet/manifests/site.pp
R support/idea-dist/codeStyleSettings.xml
R support/idea-dist/dataSources.local.xml
R support/idea-dist/dataSources.xml
5 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 6c6e165..6d81f94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
/.vagrant
/.bundle
/.gem
+/.idea
/.rbenv-version
/.settings.yaml
/*.gem
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index e2bc0fd..936f939 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -89,6 +89,13 @@
# Install common development tools
package { [ 'build-essential', 'python-dev', 'ruby-dev' ]: }
+# Initialize PHPStorm environment
+file { "/vagrant/.idea":
+ source => "/vagrant/support/idea-dist",
+ recurse => true,
+ replace => false,
+}
+
# Assign classes to nodes via hiera
# See hiera.yaml and hieradata/*.yaml
hiera_include('classes')
diff --git a/.idea/codeStyleSettings.xml
b/support/idea-dist/codeStyleSettings.xml
similarity index 100%
rename from .idea/codeStyleSettings.xml
rename to support/idea-dist/codeStyleSettings.xml
diff --git a/.idea/dataSources.local.xml
b/support/idea-dist/dataSources.local.xml
similarity index 100%
rename from .idea/dataSources.local.xml
rename to support/idea-dist/dataSources.local.xml
diff --git a/.idea/dataSources.xml b/support/idea-dist/dataSources.xml
similarity index 100%
rename from .idea/dataSources.xml
rename to support/idea-dist/dataSources.xml
--
To view, visit https://gerrit.wikimedia.org/r/187816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie90b3e3a34d0ae53c8523ef351b69bb70cf8ba0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
