Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/170025
Change subject: Track branch for special extensions
......................................................................
Track branch for special extensions
By tracking the remote branch, the git_info caching script in
scap can find the upstream and provide more useful information
in Special:Version.
without this, merge-base is used as a fallback to
git rev-list -1 @{upstream}.
For Wikidata, we base each deployment build on the last
deployment build, so for example:
git clone ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata.git
Wikidata
cd Wikidata
git checkout -b wmf/1.25wmf7 origin/wmf/1.25wmf6
git push origin wmf/1.25wmf7
then make the new build and git review wmf/1.25wmf7
This allows us to review the diff compared to the previous
deployment build and also triggers jenkins.
In doing this way, merge-base gives rather misleading info,
with a sha1 from May! (the last place/time we based the
deployment branch off of master Wikidata.git branch)
Bug: 72759
Change-Id: Ia9b7948943ba331cc10c2ed6dbf08649a2f5f60b
---
M make-wmf-branch/MakeWmfBranch.php
1 file changed, 3 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/25/170025/1
diff --git a/make-wmf-branch/MakeWmfBranch.php
b/make-wmf-branch/MakeWmfBranch.php
index a45db89..452abcf 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -167,15 +167,12 @@
if( in_array( $name, $this->branchedExtensions ) ) {
$this->runCmd( 'git', 'submodule', 'add', '-b',
$newVersion, '-q',
"{$this->anonRepoPath}/extensions/{$name}.git", "extensions/$name" );
+ } elseif ( isset( $preservedRefs[$name] ) ) {
+ $this->runCmd( 'git', 'submodule', 'add', '-q',
'-b', $preservedRefs[$name],
+
"{$this->anonRepoPath}/extensions/{$name}.git", "extensions/$name" );
} else {
$this->runCmd( 'git', 'submodule', 'add', '-q',
"{$this->anonRepoPath}/extensions/{$name}.git", "extensions/$name" );
- }
- if( isset( $preservedRefs[$name] ) ) {
- $this->chdir( "extensions/$name" );
- $this->runCmd( 'git', 'remote', 'update' );
- $this->runCmd( 'git', 'checkout', '-q',
$preservedRefs[$name] );
- $this->chdir( "../.." );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/170025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9b7948943ba331cc10c2ed6dbf08649a2f5f60b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
