jenkins-bot has submitted this change and it was merged. Change subject: patches: Update patch reference for wmf-branch live hacks ......................................................................
patches: Update patch reference for wmf-branch live hacks See I5ec8dd53188e9e. Change-Id: Ic9776f49de64b063d2936718027e03a4c512e4f2 --- M make-wmf-branch/default.conf M make-wmf-branch/make-wmf-branch 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf index 4b70fad..15fe191 100644 --- a/make-wmf-branch/default.conf +++ b/make-wmf-branch/default.conf @@ -184,7 +184,7 @@ $branchPrefix = 'wmf/'; $patches = array( - 'refs/changes/66/22466/5' => 'core', // Most of the WMF "live hacks" https://gerrit.wikimedia.org/r/#/c/22466 + 'refs/changes/66/22466/7' => 'core', // The master..wmf-branch patches https://gerrit.wikimedia.org/r/22466 ); $dryRun = false; // Don't actually push anything diff --git a/make-wmf-branch/make-wmf-branch b/make-wmf-branch/make-wmf-branch index 38b6296..e1b9c48 100755 --- a/make-wmf-branch/make-wmf-branch +++ b/make-wmf-branch/make-wmf-branch @@ -103,7 +103,7 @@ } $this->chdir( $this->buildDir ); } - + function branchExtensions() { foreach( $this->branchedExtensions as $ext ) { $this->runCmd( 'git', 'clone', '-q', "{$this->baseRepoPath}/extensions/{$ext}.git", $ext ); -- To view, visit https://gerrit.wikimedia.org/r/62738 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9776f49de64b063d2936718027e03a4c512e4f2 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Krinkle <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: Tim Starling <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
