From 6da3107a5f1414406fb10eddc6e91eb5da4006b7 Mon Sep 17 00:00:00 2001 From: Mert E Date: Fri, 24 May 2024 01:34:33 +0300 Subject: [PATCH] chore: sync to develop action (#8557) * chore: sync to develop action Signed-off-by: mertmit * chore: order of master to develop action Signed-off-by: mertmit --------- Signed-off-by: mertmit --- .github/workflows/release-nocodb.yml | 10 +++++----- .github/workflows/sync-to-develop.yml | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-nocodb.yml b/.github/workflows/release-nocodb.yml index e907d9bdcd..b393cb9e34 100644 --- a/.github/workflows/release-nocodb.yml +++ b/.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 diff --git a/.github/workflows/sync-to-develop.yml b/.github/workflows/sync-to-develop.yml index c0a4db783e..71aa5b2a3b 100644 --- a/.github/workflows/sync-to-develop.yml +++ b/.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