jenkins-bot has submitted this change and it was merged.
Change subject: Add support for mediawiki/vendor to mw-core-get.sh
......................................................................
Add support for mediawiki/vendor to mw-core-get.sh
Hackishly copy the existing logic for getting a working copy of
MediaWiki to also provision the mediawiki/vendor.git repository.
Bug: 72700
Change-Id: I2e84364e4f9cedf816d17f9ebdbeb7d6285eed4f
---
M bin/mw-core-get.sh
1 file changed, 16 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-core-get.sh b/bin/mw-core-get.sh
index 4607601..6dbb89a 100755
--- a/bin/mw-core-get.sh
+++ b/bin/mw-core-get.sh
@@ -44,3 +44,19 @@
curl
"https://git.wikimedia.org/zip/?r=mediawiki/core.git&format=gz&h=$TREE_ISH"; \
| (cd "$MW_INSTALL_PATH" && tar xzf -)
fi
+
+# HACK: After https://gerrit.wikimedia.org/r/#/c/119941/ we need to bring
+# mediawiki/vendor.git into $MW_INSTALL_PATH as well for the PSR-3 interfaces.
+VENDOR_LOCAL="/srv/ssd/gerrit/mediawiki/vendor.git"
+VENDOR_INSTALL_PATH="${MW_INSTALL_PATH}/vendor"
+mkdir $VENDOR_INSTALL_PATH
+if [ -d "$VENDOR_LOCAL" ]; then
+ # Record the exact commit fetched on stderr via 'git get-tar-commit-id'
+ git archive --remote="$VENDOR_LOCAL" "$TREE_ISH" \
+ | tee >(git get-tar-commit-id 1>&2 ; cat > /dev/null ) \
+ | (cd "$VENDOR_INSTALL_PATH" && tar xf -)
+else
+ # Fallback to git.wikimedia.org
+ curl
"https://git.wikimedia.org/zip/?r=mediawiki/vendor.git&format=gz&h=$TREE_ISH"; \
+ | (cd "$VENDOR_INSTALL_PATH" && tar xzf -)
+fi
--
To view, visit https://gerrit.wikimedia.org/r/169925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e84364e4f9cedf816d17f9ebdbeb7d6285eed4f
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
