jenkins-bot has submitted this change and it was merged.
Change subject: make-release: Add test directory and files excluded from
tarball creation
......................................................................
make-release: Add test directory and files excluded from tarball creation
* Use the yaml config to store the excluded extensions as options for
diff ignore instead of using hard-coded values in the make-release
script.
* Add the test directory and misc. files that we don't want in the
patches.
* Fix up indention of yaml file and add emacs hints to yaml header
Change-Id: I8ef4f1667141e1fa599a70f4a9a1781db466e1d8
---
M make-release/make-release.py
M make-release/make-release.yaml
2 files changed, 46 insertions(+), 38 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/make-release/make-release.py b/make-release/make-release.py
index 91c0e5f..54585c4 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -481,20 +481,8 @@
dir2 += '/languages/messages'
else:
print "Generating normal patch file..."
- excludedExtensions = [
- 'messages',
- '*.png',
- '*.jpg',
- '*.xcf',
- '*.gif',
- '*.svg',
- '*.tiff',
- '*.zip',
- '*.xmp',
- '.git*',
- ]
- for ext in excludedExtensions:
- args.extend(['-x', ext])
+ for excl in self.config['diff']['ignore']:
+ args.extend(['-x', excl])
args.extend([dir1, dir2])
print ' '.join(args)
diff --git a/make-release/make-release.yaml b/make-release/make-release.yaml
index a561860..0bceec3 100644
--- a/make-release/make-release.yaml
+++ b/make-release/make-release.yaml
@@ -1,28 +1,48 @@
-# vim: set et ts=4 sw=4:
+# vim: set et ts=4 sw=4: -*- mode: yaml-mode; yaml-indent-offset: 4 -*-
bundles:
- smw:
- - AdminLinks
- - ApprovedRevs
- - Arrays
- - DataTransfer,
- - ExternalData
- - HeaderTabs
- - Maps
- - PageSchemas
- - ReplaceText
- - SemanticCompoundQueries
- - SemanticDrilldown,
- - SemanticForms,
- - SemanticFormsInputs,
- - SemanticImageInput
- - SemanticInternalObjects
- - SemanticMaps
- - SemanticMediaWiki
- - SemanticResultFormats
- - SemanticTasks
- - SemanticWatchlist
- - Validator
- - Widgets
+ smw:
+ - AdminLinks
+ - ApprovedRevs
+ - Arrays
+ - DataTransfer,
+ - ExternalData
+ - HeaderTabs
+ - Maps
+ - PageSchemas
+ - ReplaceText
+ - SemanticCompoundQueries
+ - SemanticDrilldown,
+ - SemanticForms,
+ - SemanticFormsInputs,
+ - SemanticImageInput
+ - SemanticInternalObjects
+ - SemanticMaps
+ - SemanticMediaWiki
+ - SemanticResultFormats
+ - SemanticTasks
+ - SemanticWatchlist
+ - Validator
+ - 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: merged
Gerrit-Change-Id: I8ef4f1667141e1fa599a70f4a9a1781db466e1d8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
