From 458ccbd705192db8a03863a03693e185cb40cdd9 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 19 Apr 2023 22:33:28 +0530 Subject: [PATCH] chore: update actions to deploy nestjs backend Signed-off-by: Pranav C --- .github/workflows/release-docker.yml | 7 +++---- .github/workflows/release-npm.yml | 2 +- .github/workflows/release-pr.yml | 13 +++++++------ packages/nocodb-nest/package.json | 7 ++++--- scripts/upgradeNcGui.js | 14 +++++++------- scripts/upgradeNocodbSdk.js | 6 +++--- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml index adc17aacee..a4915919be 100644 --- a/.github/workflows/release-docker.yml +++ b/.github/workflows/release-docker.yml @@ -43,7 +43,7 @@ jobs: buildx: runs-on: ubuntu-latest env: - working-directory: ./packages/nocodb + working-directory: ./packages/nocodb-nest steps: - name: Get Docker Repository id: get-docker-repository @@ -58,7 +58,7 @@ jobs: if [[ ${{ github.event.inputs.currentVersion || inputs.currentVersion || 'N/A' }} != 'N/A' ]]; then DOCKER_BUILD_TAG=${{ github.event.inputs.currentVersion || inputs.currentVersion }}-${{ github.event.inputs.tag || inputs.tag }} fi - if [[ ${{ inputs.isDaily || 'N' }} == 'Y' ]]; then + if [[ ${{ inputs.isDaily || 'N' }} == 'Y' ]]; then DOCKER_REPOSITORY=${DOCKER_REPOSITORY}-daily else DOCKER_REPOSITORY=${DOCKER_REPOSITORY}-timely @@ -90,7 +90,7 @@ jobs: cd packages/nocodb-sdk npm install && npm run build cd ../.. - targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNocodbSdk.js && + targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNocodbSdk.js && targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNcGuiVersion.js && cd packages/nc-gui npm install @@ -104,7 +104,6 @@ jobs: - name: Build nocodb and docker files run: | - npm run build npm run docker:build working-directory: ${{ env.working-directory }} diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml index 55ec46d9af..257ebab89b 100644 --- a/.github/workflows/release-npm.yml +++ b/.github/workflows/release-npm.yml @@ -35,7 +35,7 @@ jobs: release: runs-on: ubuntu-latest env: - working-directory: ./packages/nocodb + working-directory: ./packages/nocodb-nest steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index d29e6b7a17..0eb1a0393d 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -13,6 +13,7 @@ on: - "packages/nc-gui/**" - "packages/nc-plugin/**" - "packages/nocodb/**" + - "packages/nocodb-nest/**" concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -116,13 +117,13 @@ jobs: - name: Upload Rendered Compose File as Artifact uses: actions/upload-artifact@v3 with: - name: preview-spec + name: preview-spec path: docker-compose.rendered.yml retention-days: 2 - name: Serialize PR Event to File run: | cat << EOF > event.json - ${{ toJSON(github.event) }} + ${{ toJSON(github.event) }} EOF - name: Upload PR Event as Artifact uses: actions/upload-artifact@v3 @@ -130,7 +131,7 @@ jobs: name: preview-spec path: event.json retention-days: 2 - + # Add a comment for PR executable build # leave-executable-comment: # if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' && github.event.pull_request.draft == false && github.base_ref == 'develop' && github.event.action != 'closed' }} @@ -177,12 +178,12 @@ jobs: - name: Serialize PR Event to File run: | cat << EOF > event.json - ${{ toJSON(github.event) }} - + ${{ toJSON(github.event) }} + EOF - name: Upload PR Event as Artifact uses: actions/upload-artifact@v3 with: name: preview-spec path: event.json - retention-days: 2 \ No newline at end of file + retention-days: 2 diff --git a/packages/nocodb-nest/package.json b/packages/nocodb-nest/package.json index 955172eef8..664aa02987 100644 --- a/packages/nocodb-nest/package.json +++ b/packages/nocodb-nest/package.json @@ -1,7 +1,7 @@ { - "name": "nocodb-nest", - "version": "0.0.1", - "description": "NocoDB Backend (Nest)", + "name": "nocodb", + "version": "0.106.1", + "description": "NocoDB Backend", "main": "dist/bundle.js", "author": { "name": "NocoDB Inc", @@ -20,6 +20,7 @@ "scripts": { "build": "nest build", "build:obfuscate": "EE=true webpack --config webpack.config.js", + "obfuscate:build:publish": "npm run build:obfuscate && npm publish .", "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"", "start": "nest start", "start:dev": "nest start --watch", diff --git a/scripts/upgradeNcGui.js b/scripts/upgradeNcGui.js index d984562bc9..b18eb53378 100644 --- a/scripts/upgradeNcGui.js +++ b/scripts/upgradeNcGui.js @@ -22,8 +22,8 @@ const replacePackageName = (filePath) => { const bumbVersionAndSave = () => { // upgrade nc-lib-gui version in nocodb - execSync(`cd packages/nocodb && npm install --save --save-exact ${ncLibPackage.name}@${ncLibPackage.version}`, {}); - const nocodbPackageFilePath = path.join(__dirname, '..', 'packages', 'nocodb', 'package.json') + execSync(`cd packages/nocodb-nest && npm install --save --save-exact ${ncLibPackage.name}@${ncLibPackage.version}`, {}); + const nocodbPackageFilePath = path.join(__dirname, '..', 'packages', 'nocodb-nest', 'package.json') const nocoLibPackage = JSON.parse(fs.readFileSync(nocodbPackageFilePath)) if (process.env.targetEnv === 'DEV') { nocoLibPackage.name = `${nocoLibPackage.name}-daily` @@ -35,11 +35,11 @@ const bumbVersionAndSave = () => { if (process.env.targetEnv === 'DEV') { // replace nc-lib-gui by nc-lib-gui-daily if it is nightly build / pr release const filePaths = [ - path.join(__dirname, '..', 'packages', 'nocodb', 'Dockerfile'), - path.join(__dirname, '..', 'packages', 'nocodb', 'litestream', 'Dockerfile'), - path.join(__dirname, '..', 'packages', 'nocodb', 'package.json'), - path.join(__dirname, '..', 'packages', 'nocodb', 'README.md'), - path.join(__dirname, '..', 'packages', 'nocodb', 'src', 'lib', 'Noco.ts'), + path.join(__dirname, '..', 'packages', 'nocodb-nest', 'Dockerfile'), + path.join(__dirname, '..', 'packages', 'nocodb-nest', 'litestream', 'Dockerfile'), + path.join(__dirname, '..', 'packages', 'nocodb-nest', 'package.json'), + path.join(__dirname, '..', 'packages', 'nocodb-nest', 'README.md'), + path.join(__dirname, '..', 'packages', 'nocodb-nest', 'src', 'lib', 'Noco.ts'), ] Promise.all(filePaths.map(filePath => { return replacePackageName(filePath) })).then(() => { bumbVersionAndSave(); diff --git a/scripts/upgradeNocodbSdk.js b/scripts/upgradeNocodbSdk.js index 5deb3d8d64..f031168df2 100644 --- a/scripts/upgradeNocodbSdk.js +++ b/scripts/upgradeNocodbSdk.js @@ -20,7 +20,7 @@ const replacePackageName = (filePath) => { const bumbVersionAndSave = () => { // upgrade nocodb-sdk version in nocodb - execSync(`cd packages/nocodb && npm install --save --save-exact ${nocodbSdkPackage.name}@${nocodbSdkPackage.version}`, {}); + execSync(`cd packages/nocodb-nest && npm install --save --save-exact ${nocodbSdkPackage.name}@${nocodbSdkPackage.version}`, {}); // upgrade nocodb-sdk version in nc-gui execSync(`cd packages/nc-gui && npm install --save --save-exact ${nocodbSdkPackage.name}@${nocodbSdkPackage.version}`, {}); } @@ -47,9 +47,9 @@ const dfs = function(dir) { const searchAndReplace = (target) => { let list = [ ...dfs(path.resolve(path.join(__dirname, '..', 'packages', 'nc-gui'))), - ...dfs(path.resolve(path.join(__dirname, '..', 'packages', 'nocodb'))), + ...dfs(path.resolve(path.join(__dirname, '..', 'packages', 'nocodb-nest'))), path.join(__dirname, '..', 'packages', 'nc-gui', 'package.json'), - path.join(__dirname, '..', 'packages', 'nocodb', 'package.json') + path.join(__dirname, '..', 'packages', 'nocodb-nest', 'package.json') ] return Promise.all(list.map(d => { return new Promise((resolve, reject) => {