8
0
Просмотр исходного кода

Merge pull request #1453 from ckeditor/mgit/t/73

Internal: Aligned the repository to the changes in `mgit`. See cksource/mgit2#82.
Piotrek Koszuliński 7 лет назад
Родитель
Сommit
551d8fa3ed

+ 1 - 1
.travis.yml

@@ -19,7 +19,7 @@ before_install:
 - npm i -g yarn
 install:
 - yarn add mgit2 --ignore-workspace-root-check
-- mgit bootstrap --resolver-url-template="https://github.com/\${ path }.git"
+- mgit sync --resolver-url-template="https://github.com/\${ path }.git"
 - yarn
 script:
 - yarn run test --reporter=dots

+ 1 - 1
docs/framework/guides/contributing/contributing.md

@@ -87,7 +87,7 @@ Some additional things you should keep in mind:
 * Make sure you signed the [Contributor License Agreement (CLA)](#contributor-license-agreement-cla) and that tests pass. Test your changes!
 
 <info-box>
-	If want your changes to be permanent in your development environment, make sure your `mgit.json` file {@link framework/guides/contributing/development-environment#using-mgit-for-custom-packages points to your forked version of the repository} so next time you execute `mgit update` to refresh the project, the utility will use your fork.
+	If want your changes to be permanent in your development environment, make sure your `mgit.json` file {@link framework/guides/contributing/development-environment#using-mgit-for-custom-packages points to your forked version of the repository} so next time you execute `mgit sync` to refresh the project, the utility will use your fork.
 </info-box>
 
 ## Translating

+ 2 - 2
docs/framework/guides/contributing/development-environment.md

@@ -62,7 +62,7 @@ In order to work with development versions of all the official packages, it is r
 First, clone all the repositories:
 
 ```bash
-mgit bootstrap
+mgit sync
 ```
 
 Expected result:
@@ -112,7 +112,7 @@ Whenever you want to update all packages to their latest versions call:
 git pull
 
 # To update pull changes to all the packages:
-mgit update
+mgit sync
 ```
 
 From time to time, if the list of dependencies in any of the packages changed, you will need to call Yarn again to symlink them:

+ 1 - 1
package.json

@@ -104,7 +104,7 @@
     "precommit": "lint-staged",
     "test": "node --max_old_space_size=4096 node_modules/@ckeditor/ckeditor5-dev-tests/bin/test.js",
     "manual": "node --max_old_space_size=4096 node_modules/@ckeditor/ckeditor5-dev-tests/bin/test-manual.js",
-    "bootstrap": "mgit bootstrap && yarn install",
+    "bootstrap": "mgit sync && yarn install",
     "clean": "rm -rf node_modules && mgit exec 'rm -rf node_modules'",
     "reset": "rm -rf ./packages ./node_modules && yarn run bootstrap",
     "reinstall": "yarn run clean && yarn run bootstrap",

+ 2 - 2
scripts/bump-year.js

@@ -14,10 +14,10 @@ mgit exec 'node ../../scripts/bump-year.js'
 node scripts/bump-year.js
 
 Full command to update the entire project:
-git pull && mgit update && mgit exec 'node ../../scripts/bump-year.js' && node scripts/bump-year.js
+git pull && mgit sync && mgit exec 'node ../../scripts/bump-year.js' && node scripts/bump-year.js
 
 And after reviewing the changes:
-mgit exec 'git commit -am "Internal: Bumped the year. [skip ci]" && git push' && git commit -am "Internal: Bumped the year." && git push
+mgit commit -m "Internal: Bumped the year. [skip ci]" && mgit push git commit -am "Internal: Bumped the year." && git push
 
 */