Browse Source

Merge pull request #7941 from nocodb/chore/master-sync-action

chore: create PR for master sync after release
pull/7951/head
Mert E 8 months ago committed by GitHub
parent
commit
5fb78f1bc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 40
      .github/workflows/sync-to-develop.yml
  2. 5
      scripts/upgradeNocodbSdk.js

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

@ -9,15 +9,37 @@ jobs:
sync-to-develop:
runs-on: ubuntu-latest
steps:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.19.1
- name: Checkout
uses: actions/checkout@v1
- name: Merge from master to develop
uses: wingkwong/gh-action-nightly-merge@master
uses: actions/checkout@v3
with:
stable_branch: 'master'
development_branch: 'develop'
allow_ff: true
allow_forks: true
token: ${{ secrets.GITHUB_TOKEN }}
path: nocodb
- name: Prepare GH Cli
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:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
cd nocodb
git fetch --quiet --unshallow origin
git checkout 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
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

5
scripts/upgradeNocodbSdk.js

@ -5,6 +5,11 @@ const execSync = require('child_process').execSync;
// extract latest version from package.json
const nocodbSdkPackage = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'packages', 'nocodb-sdk', 'package.json'), 'utf8'))
if (process.env.revertSDK === 'true') {
nocodbSdkPackage.version = 'workspace:^';
}
const replacePackageName = (filePath) => {
return new Promise((resolve, reject) => {
return fs.readFile(filePath, 'utf8', function (err, data) {

Loading…
Cancel
Save