jenkins-bot has submitted this change and it was merged. Change subject: Updates for Blockly repo changes ......................................................................
Updates for Blockly repo changes Per Niel Fraser: We underwent an unplanned code repo migration for engineering reasons that broke lots of stuff. But we are back, and the move gave us the opportunity to make a bunch of improvements. As part of maturing, Blockly has split into two projects: * https://github.com/google/blockly This is the core library that is being used by hundreds of organizations to build Blockly-based applications. * https://github.com/google/blockly-games This is the suite of educational applications for teaching programming to children. Change-Id: Ice33c6041042b0b32f6c4668f57f9e386e5dd2e2 --- M REPOCONF M REPOCONF.siebrand M bin/repocommit M bin/repocreate M bin/repoupdate M groups/Blockly/Blockly.yaml 6 files changed, 24 insertions(+), 24 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/REPOCONF b/REPOCONF index e294525..c258226 100644 --- a/REPOCONF +++ b/REPOCONF @@ -6,7 +6,8 @@ REPO_MWEXTGIT=https://gerrit.wikimedia.org/r/p/mediawiki/extensions REPO_MWSKINGIT=https://gerrit.wikimedia.org/r/p/mediawiki/skins -REPO_BLOCKLY=http://blockly.googlecode.com/svn/trunk/ +REPO_BLOCKLY=git://github.com/google/blockly.git +REPO_BLOCKLYGAMES=git://github.com/google/blockly-games.git REPO_EOL=git://github.com/EOL/eol.git REPO_ETHERPADLITE=git://github.com/ether/etherpad-lite.git REPO_ETHERPADLITE_BRANCH="develop" diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand index 97a4e94..e01333f 100644 --- a/REPOCONF.siebrand +++ b/REPOCONF.siebrand @@ -6,7 +6,8 @@ REPO_MWEXTGIT=ssh://[email protected]:29418/mediawiki/extensions REPO_MWSKINGIT=ssh://[email protected]:29418/mediawiki/skins -REPO_BLOCKLY=https://blockly.googlecode.com/svn/trunk/ [email protected]:google/blockly.git [email protected]:google/blockly-games.git [email protected]:EOL/eol.git [email protected]:ether/etherpad-lite.git REPO_ETHERPADLITE_BRANCH="develop" diff --git a/bin/repocommit b/bin/repocommit index 9ee01d4..c3d54c8 100755 --- a/bin/repocommit +++ b/bin/repocommit @@ -52,6 +52,7 @@ # TODO: Move to separate file? GITPROJECTS="\ +blockly \ eol \ europeana \ freecol \ @@ -75,6 +76,11 @@ if [ "$i" = "$PROJECT" ] then gitCommit "$PROJECT" + + if [ "$PROJECT" = "blockly" ] + then + gitCommit blockly-games + fi if [ "$PROJECT" = "osm" ] then @@ -100,18 +106,7 @@ fi done -if [ "$PROJECT" = "blockly" ] -then - cd $PROJECT - svn add -q --force * - for i in `find . -name *.json` - do - svn propset -q svn:mime-type text/plain $i - done - svn commit --message "$COMMITMSG" - cd .. - -elif [ "$PROJECT" = "etherpad-lite" ] +if [ "$PROJECT" = "etherpad-lite" ] then gitCommit "$PROJECT" develop diff --git a/bin/repocreate b/bin/repocreate index a7461f6..2fdb4c7 100755 --- a/bin/repocreate +++ b/bin/repocreate @@ -34,7 +34,9 @@ if [ "$PROJECT" = "blockly" ] then checkVar 'REPO_BLOCKLY' - svn checkout "$REPO_BLOCKLY" $PROJECT + git clone "$REPO_BLOCKLY" $PROJECT + checkVar 'REPO_BLOCKLYGAMES' + git clone "$REPO_BLOCKLYGAMES" blockly-games elif [ "$PROJECT" = "eol" ] then diff --git a/bin/repoupdate b/bin/repoupdate index 45f7487..3405000 100755 --- a/bin/repoupdate +++ b/bin/repoupdate @@ -103,7 +103,8 @@ if [ "$PROJECT" = "blockly" ] then - svn up -q $PROJECT + gitupdate "$PROJECT" + gitupdate "blockly-games" elif [ "$PROJECT" = "etherpad-lite" ] then diff --git a/groups/Blockly/Blockly.yaml b/groups/Blockly/Blockly.yaml index 5e6d0a1..e909d01 100644 --- a/groups/Blockly/Blockly.yaml +++ b/groups/Blockly/Blockly.yaml @@ -23,14 +23,6 @@ --- BASIC: - id: out-blockly-apps - label: Blockly Apps - -FILES: - sourcePattern: "%GROUPROOT%/blockly/apps/json/%CODE%.json" - ---- -BASIC: id: out-blockly-core label: Blockly Core @@ -102,3 +94,11 @@ - VARIABLES_SET_HELPURL ignored: - COLOUR_RANDOM_HELPURL + +--- +BASIC: + id: out-blockly-games + label: Blockly Games + +FILES: + sourcePattern: "%GROUPROOT%/blockly-games/json/%CODE%.json" -- To view, visit https://gerrit.wikimedia.org/r/171847 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice33c6041042b0b32f6c4668f57f9e386e5dd2e2 Gerrit-PatchSet: 2 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
