jenkins-bot has submitted this change and it was merged. Change subject: Make branch versions of *all* extensions on internal release ......................................................................
Make branch versions of *all* extensions on internal release * This makes backports much easier (e.g. "cherry-pick-to" in gerrit) Change-Id: I1d43952cbb3aa78b6265860e935f08320db9ccc3 --- M make-wmf-branch/default.conf M make-wmf-branch/make-wmf-branch 2 files changed, 7 insertions(+), 12 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 a69d382..d953b5c 100644 --- a/make-wmf-branch/default.conf +++ b/make-wmf-branch/default.conf @@ -4,8 +4,9 @@ # You can override variables in this file by creating a file in the same # directory called local.conf -# These extensions are all pulling from HEAD on master -$normalExtensions = array( +# Branched extensions - these extensions are branched along with core. +# Branching instead of using a HEAD checkout makes it easy to backport changes. +$branchedExtensions = array( 'AbuseFilter', 'AccountAudit', 'ActiveAbstract', // Used as part of dumpBackup @@ -143,6 +144,7 @@ 'Vector', 'VectorBeta', 'VipsScaler', + 'VisualEditor', 'WikiEditor', 'wikihiero', 'WikiLove', @@ -173,12 +175,6 @@ 'SemanticMediaWiki' => '1.8.x', 'SemanticResultFormats' => '1.8.x', 'Validator' => '0.5.x', -); - -# Branched extensions - these extensions are branched along with core since we've got -# to maintain live hacks for them. -$branchedExtensions = array( - 'VisualEditor', ); # Repository paths. $baseRepoPath is for operations that require write operations diff --git a/make-wmf-branch/make-wmf-branch b/make-wmf-branch/make-wmf-branch index 9420048..05148e0 100755 --- a/make-wmf-branch/make-wmf-branch +++ b/make-wmf-branch/make-wmf-branch @@ -23,7 +23,7 @@ class MakeWmfBranch { var $dryRun; var $newVersion, $oldVersion, $buildDir; - var $normalExtensions, $specialExtensions, $branchedExtensions, $patches; + var $specialExtensions, $branchedExtensions, $patches; var $baseRepoPath, $anonRepoPath; var $noisy; @@ -40,9 +40,8 @@ $this->dryRun = $dryRun; $this->buildDir = $buildDir; - $this->normalExtensions = $normalExtensions; - $this->specialExtensions = $specialExtensions; $this->branchedExtensions = $branchedExtensions; + $this->specialExtensions = $specialExtensions; $this->noisy = $noisy; $this->patches = $patches; $this->baseRepoPath = $baseRepoPath; @@ -168,7 +167,7 @@ # Add extension submodules foreach ( - array_merge( $this->normalExtensions, array_keys( $this->specialExtensions ), $this->branchedExtensions ) + array_merge( array_keys( $this->specialExtensions ), $this->branchedExtensions ) as $name ) { if( in_array( $name, $this->branchedExtensions ) ) { $this->runCmd( 'git', 'submodule', 'add', '-b', $newVersion, '-q', -- To view, visit https://gerrit.wikimedia.org/r/104776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d43952cbb3aa78b6265860e935f08320db9ccc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits