Update cherryPick.js

vaadin · Feb 14, 2023 · 8f4e830 · 8f4e830
1 parent 39dfa9d
commit 8f4e830
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/scripts/cherryPick.js b/scripts/cherryPick.js
@@ -122,7 +122,7 @@ async function cherryPickCommits(){
   for(let i=arrPR.length-1; i>=0; i--){
     let branchName = `cherry-pick-${arrPR[i]}-to-${arrBranch[i]}-${Date.now()}`;
 
-    await exec('git checkout master');
+    await exec('git checkout main');
     await exec('git pull');
     await exec(`git checkout ${arrBranch[i]}`);
     await exec(`git reset --hard origin/${arrBranch[i]}`);
@@ -141,14 +141,14 @@ async function cherryPickCommits(){
       await labelCommit(arrURL[i], `need to pick manually ${arrBranch[i]}`);
       await postComment(arrURL[i], arrUser[i], arrMergedBy[i], arrBranch[i], err);
       await exec(`git cherry-pick --abort`);
-      await exec(`git checkout master`);
+      await exec(`git checkout main`);
       await exec(`git branch -D ${branchName}`);
       continue;
     }
     await exec(`git push origin HEAD:${branchName}`);
 
     await createPR(arrTitle[i], branchName, arrBranch[i]);
-    await exec(`git checkout master`);
+    await exec(`git checkout main`);
     await exec(`git branch -D ${branchName}`);
     await labelCommit(arrURL[i], `cherry-picked-${arrBranch[i]}`);
   }