Browse Source

Merge pull request #1905 from ckeditor/t/1899

Internal: Simplified updating the #stable branches process during releases. Closes #1899.
Piotrek Koszuliński 6 years ago
parent
commit
2ff8e44711
2 changed files with 7 additions and 18 deletions
  1. 1 0
      mrgit.json
  2. 6 18
      scripts/update-stable-branches.sh

+ 1 - 0
mrgit.json

@@ -1,6 +1,7 @@
 {
   "packages": "packages/",
   "packagesPrefix": "@ckeditor/ckeditor5-",
+  "baseBranches": [ "master", "stable" ],
   "dependencies": {
     "@ckeditor/ckeditor5-adapter-ckfinder": "ckeditor/ckeditor5-adapter-ckfinder",
     "@ckeditor/ckeditor5-alignment": "ckeditor/ckeditor5-alignment",

+ 6 - 18
scripts/update-stable-branches.sh

@@ -10,28 +10,16 @@ echo ""
 
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
-	# Update the `stable` branch in the ckeditor5 repository.
+	# Update the `stable` branch in the `ckeditor5` repository.
 	git checkout stable && git merge master && git checkout master
 
-	# Add `stable` branches in all repos which don't have them yet.
-	mrgit exec 'git checkout -b stable 2> /dev/null && git push origin stable && git checkout master'
+	# Add `#stable` branches in all repos which don't have them yet.
+	mgit exec 'git checkout -b stable 2> /dev/null && git push origin stable && git checkout master'
 
-	# Update all `stable` branches in all packages.
-	mrgit exec 'git checkout stable && git pull origin stable && git merge master && git checkout master'
+	# Update all `#stable` branches in all packages.
+	mgit exec 'git checkout stable && git pull origin stable && git merge master && git checkout master'
 
-	# Make sure that `mrgit.json` for `stable` and `master` branches is correct.
-	# `stable` branch.
-	git checkout stable && \
-	node ./scripts/release/update-mrgit-branches stable && \
-	git commit -a -m "Internal: Use stable branches. [skip ci]"
-
-	# `master` branch.
-	git checkout master && \
-	git merge stable && \
-	node ./scripts/release/update-mrgit-branches master && \
-	git commit -a -m "Internal: Use master branches. [skip ci]"
-
-	# Push the `stable` branches.
+	# Push the `#stable` branches.
 	git push origin stable master && \
 	mrgit exec 'git push origin stable'