@ -9,15 +9,36 @@ jobs:
sync-to-develop:
sync-to-develop:
runs-on : ubuntu-latest
runs-on : ubuntu-latest
steps:
steps:
- name : Setup Node
uses : actions/setup-node@v3
with:
node-version : 18.19 .1
- name : Checkout
- name : Checkout
uses : actions/checkout@v1
uses : actions/checkout@v3
- name : Merge from master to develop
uses : wingkwong/gh-action-nightly-merge@master
with:
with:
stable_branch : 'master'
token : ${{ secrets.GITHUB_TOKEN }}
development_branch : 'develop'
path : nocodb
allow_ff : true
- name : Prepare GH Cli
allow_forks : true
id : gh
run : |
wget https://github.com/cli/cli/releases/download/v2.33.0/gh_2.33.0_linux_amd64.tar.gz
tar -xvf gh_2.33.0_linux_amd64.tar.gz
GH=gh_2.33.0_linux_amd64/bin/gh
echo "GH=${GH}" >> $GITHUB_OUTPUT
- name : Sync Master to Develop
id : sync
env:
env:
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
run : |
cd nocodb
git fetch --quiet --unshallow origin
git checkout master
BRANCH_NAME=oss/$(git rev-list -n 3 HEAD | tail -1 | cut -c1-8)
git checkout -b $BRANCH_NAME
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
revertSDK=true node scripts/upgradeNocodbSdk.js
git add .
git diff-index --quiet HEAD || git commit -m "chore: update sdk path"
git push origin $BRANCH_NAME
../${{ steps.gh.outputs.GH }} pr create --title "chore: post-release sync" --body "$(echo -e "This is an automated pull request to sync the master branch to develop.\nPlease review and merge this pull request if it looks good.")" --base develop --head $BRANCH_NAME