Thcipriani has uploaded a new change for review. https://gerrit.wikimedia.org/r/204080
Change subject: Add submodules to master checkoutMediaWiki ...................................................................... Add submodules to master checkoutMediaWiki Builds on the ideas in I0a206a8b5c4beabcbd161fbabebf223f5bd104d2 adds additional necessary repos. Bug: T88442 Change-Id: I76ea0b71df6bfd89344b977660fa7e839602e7d7 --- M multiversion/checkoutMediaWiki.php 1 file changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/80/204080/1 diff --git a/multiversion/checkoutMediaWiki.php b/multiversion/checkoutMediaWiki.php index d225ac4..1455a89 100644 --- a/multiversion/checkoutMediaWiki.php +++ b/multiversion/checkoutMediaWiki.php @@ -65,6 +65,67 @@ print "Error checking out branch\n"; exit( 1 ); } + + # master has no extensions, vendor, or skins in submodules + if ($checkoutVersion === 'master') { + $gerrit = 'https://gerrit.wikimedia.org'; + + $repos = array( + 'extensions' => 'r/p/mediawiki/extensions', + 'vendor' => 'r/mediawiki/vendor.git', + 'skins/CologneBlue' => 'r/mediawiki/skins/CologneBlue', + 'skins/Modern' => 'r/mediawiki/skins/Modern', + 'skins/MonoBook' => 'r/mediawiki/skins/MonoBook', + 'skins/Vector' => 'r/mediawiki/skins/Vector', + ); + + foreach($repos as $dir => $upstream) { + $rawPath = "${destIP}/${dir}"; + + list($path, $upstream) = array_map( + 'escapeshellarg', + array( + $rawPath, + "${gerrit}/${upstream}", + ) + ); + + if (file_exists( $rawPath )) { + chdir( $rawPath ); + + $cmds = array( + 'git init', + "git remote add origin ${upstream}", + 'git fetch', + 'git checkout -f -t origin/master', + ); + + } else { + $cmds = array( + "git clone ${upstream} ${path}", + ); + } + + foreach ($cmds as $cmd) { + passthru( $cmd, $ret ); + + if ( $ret ) { + print "'${cmd}' failed in ${path}\n"; + exit(1); + } + } + + chdir( $rawPath ); + passthru( 'git submodule update --init --recursive' , $ret ); + + if ( $ret ) { + print "Submodule update failed in ${dir}\n"; + exit(1); + } + chdir( $destIP ); + } + } + passthru( 'git submodule update --init --recursive', $ret ); if ( $ret ) { print "Error updating submodules\n"; -- To view, visit https://gerrit.wikimedia.org/r/204080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76ea0b71df6bfd89344b977660fa7e839602e7d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits