Merge pull request #8558 from nocodb/chore/sync-to-develop-master

chore: sync to develop master (master)

.github/workflows/release-nocodb.yml

@@ -59,6 +59,11 @@ jobs:
     with:
       tag: ${{ needs.process-input.outputs.target_tag }}
       targetEnv: ${{ github.event.inputs.targetEnv || 'PROD' }}
+  
+  # Create a PR to sync changes back to develop branch from master
+  sync-to-develop:
+    needs: [pr-to-master, process-input]
+    uses: ./.github/workflows/sync-to-develop.yml
 
   # Build, install, publish frontend and backend to npm
   release-npm:
@@ -116,8 +121,3 @@ jobs:
     uses: ./.github/workflows/publish-docs.yml
     secrets:
       GH_TOKEN: "${{ secrets.GH_TOKEN }}"
-
-  # Sync changes to develop
-  sync-to-develop:
-    needs: publish-docs
-    uses: ./.github/workflows/sync-to-develop.yml

.github/workflows/sync-to-develop.yml

@@ -37,6 +37,8 @@ jobs:
           cd nocodb
           git fetch --quiet --unshallow origin
           git checkout master
+          # reset to origin/master
+          git reset --hard origin/master
           : # Use the first 8 characters of the latest commit hash as the branch name
           BRANCH_NAME=nc/$(git rev-list -n 1 HEAD | cut -c1-8)
           git checkout -b $BRANCH_NAME