jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404876 )

Change subject: makerelease.py: Simplify file output
......................................................................


makerelease.py: Simplify file output

Change-Id: I4928f7b063c72eae4808a8c4bb6a9786e06c8b94
---
M make-release/makerelease.py
1 file changed, 9 insertions(+), 20 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/make-release/makerelease.py b/make-release/makerelease.py
index a6e3b80..8afa331 100755
--- a/make-release/makerelease.py
+++ b/make-release/makerelease.py
@@ -31,7 +31,7 @@
         '--conf', dest='conffile',
         default=os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            'make-release.yaml'),
+            'settings.yaml'),
         help='specify the configuration file')
 
     # Positional arguments:
@@ -515,16 +515,16 @@
         out_files = []
         out_files.append(
             self.make_tar(
+                package=package,
+                input_dir=package,
+                build_dir=build_dir)
+        )
+        out_files.append(
+            self.make_tar(
                 package='mediawiki-core-' + version.raw,
                 input_dir=package,
                 build_dir=build_dir,
                 add_args=ext_exclude)
-        )
-        out_files.append(
-            self.make_tar(
-                package=package,
-                input_dir=package,
-                build_dir=build_dir)
         )
 
         # Patch
@@ -578,20 +578,9 @@
 
         server = 
'https://releases.wikimedia.org/mediawiki/{}/'.format(major_ver)
         print('Download:')
-        print(server + package + '.tar.gz')
+        for file_name in out_files:
+            print(server + file_name)
         print()
-
-        if prev_version is not None:
-            if i18n_patch:
-                print("Patch to previous version (" + prev_version +
-                      "), without interface text:")
-                print(server + package + '.patch.gz')
-                print("Interface text changes:")
-                print(server + i18n_patch)
-            else:
-                print("Patch to previous version (" + prev_version + "):")
-                print(server + package + '.patch.gz')
-            print()
 
         print('GPG signatures:')
         for file_name in out_files:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4928f7b063c72eae4808a8c4bb6a9786e06c8b94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to