fix(main master mixup): fix main master mixup

imbhargav5 · Apr 21, 2021 · e9e17af · e9e17af
1 parent 7f35931
commit e9e17af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: Node CI
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -18,6 +18,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@master
+        with:
+          ref: main
       - name: Use Node.js 15.x
         uses: actions/setup-node@v1
         with:
@@ -47,5 +49,6 @@ jobs:
           git add packages/docusaurus
           git -c user.name="imbhargav5" -c user.email="imbhargav5@users.noreply.github.com" \
             commit -m "Update ${{ steps.tags.outputs.new }} docusaurus [skip ci]" --no-verify --quiet
-          git push "https://imbhargav5:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git" master      
+          git pull "https://imbhargav5:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git" main --rebase
+          git push "https://imbhargav5:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git" main      
 
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -1,9 +1,9 @@
-name: Node CI Main
+name: Node CI Master
 
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   build:
@@ -18,8 +18,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@master
-        with:
-          ref: main
       - name: Use Node.js 15.x
         uses: actions/setup-node@v1
         with:
@@ -37,8 +35,6 @@ jobs:
       - name: Install project dependencies
         if: steps.yarn-cache.outputs.cache-hit != 'true' # Over here!
         run: yarn
-      - name: build
-        run: yarn build:only
       - name: test
         run: yarn test
       - name: Generate docusaurus        
@@ -51,6 +47,5 @@ jobs:
           git add packages/docusaurus
           git -c user.name="imbhargav5" -c user.email="imbhargav5@users.noreply.github.com" \
             commit -m "Update ${{ steps.tags.outputs.new }} docusaurus [skip ci]" --no-verify --quiet
-          git pull origin main --rebase
-          git push "https://imbhargav5:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git" main      
+          git push "https://imbhargav5:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git" master