MarkAHershberger has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/172092

Change subject: Add test directory and files excluded from tarball creation 
Ignore files for diff
......................................................................

Add test directory and files excluded from tarball creation
Ignore files for diff

Change-Id: I8ef4f1667141e1fa599a70f4a9a1781db466e1d8
---
M make-release/make-release.py
M make-release/make-release.yaml
2 files changed, 22 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/92/172092/1

diff --git a/make-release/make-release.py b/make-release/make-release.py
index f2c16fe..65750ff 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -492,19 +492,7 @@
             dir2 += '/languages/messages'
         else:
             print "Generating normal patch file..."
-            excludedAddOns = [
-                'messages',
-                '*.png',
-                '*.jpg',
-                '*.xcf',
-                '*.gif',
-                '*.svg',
-                '*.tiff',
-                '*.zip',
-                '*.xmp',
-                '.git*',
-            ]
-            for excl in excludedAddOns:
+            for excl in config.setting['diff']['ignore']:
                 args.extend(['-x', excl])
 
         args.extend([dir1, dir2])
diff --git a/make-release/make-release.yaml b/make-release/make-release.yaml
index 49c25d4..1ea2a24 100644
--- a/make-release/make-release.yaml
+++ b/make-release/make-release.yaml
@@ -88,6 +88,27 @@
         - extensions/SemanticWatchlist
         - extensions/Validator
         - extensions/Widgets
+diff:
+    ignore:
+        - "*~"
+        - ".js*"
+        - ".git*"
+        - testsuite
+        - tests
+        - "*.xcf"
+        - "#*#"
+        - ".#*"
+        - .travis.yml
+        - messages
+        - "*.png"
+        - "*.jpg"
+        - "*.xcf"
+        - "*.gif"
+        - "*.svg"
+        - "*.tiff"
+        - "*.zip"
+        - "*.xmp"
+
 tar:
     ignore:
         - "*~"

-- 
To view, visit https://gerrit.wikimedia.org/r/172092
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ef4f1667141e1fa599a70f4a9a1781db466e1d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to