MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/95575
Change subject: Misc fixes for build/test scripts
......................................................................
Misc fixes for build/test scripts
* Make testReleaseTarball.php work with composer's vendor/autoload.php
* Fix buld paths for make-release.py
Change-Id: I76d40a4f89947fc44cac97f7dd09ebcb9d8c9c57
---
M make-release/make-release.py
M make-release/testReleaseTarball.php
2 files changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/75/95575/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index 70cfb85..bb993ff 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -459,19 +459,19 @@
# Generate the .tar.gz files
outFiles = []
- resultDir = buildDir + '/' + dir
+ os.chdir(buildDir)
outFiles.append(
self.makeTarFile(
package='mediawiki-core-' + version,
- targetDir=buildDir + '/' + package,
- tarFileDir=resultDir,
+ targetDir='../' + package,
+ dir=dir,
argAdd=extExclude)
)
outFiles.append(
self.makeTarFile(
package=package,
- targetDir=buildDir + '/' + package,
- tarFileDir=resultDir)
+ targetDir='../' + package,
+ dir=dir)
)
# Patch
diff --git a/make-release/testReleaseTarball.php
b/make-release/testReleaseTarball.php
index 9397c67..54f83ec 100644
--- a/make-release/testReleaseTarball.php
+++ b/make-release/testReleaseTarball.php
@@ -14,6 +14,8 @@
* @file
*/
+require 'vendor/autoload.php';
+
/**
* PHPUnit based tests.
*/
@@ -84,13 +86,15 @@
public static function tearDownAfterClass() {
parent::tearDownAfterClass();
- //there seems to be a handle on the language files immediately
after
+ //there seems to be a handle on the language files immediately
after
//install, so let's wait for a second
sleep(1);
//remove install dir
- $cmd = 'rm -r mediawiki-' . self::$version;
- $result = shell_exec( $cmd );
+ if ( file_exists( 'mediawiki-' . self::$version ) ) {
+ $cmd = 'rm -r mediawiki-' . self::$version;
+ $result = shell_exec( $cmd );
+ }
}
protected function getDefaultSettingsFilePath() {
--
To view, visit https://gerrit.wikimedia.org/r/95575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76d40a4f89947fc44cac97f7dd09ebcb9d8c9c57
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
