diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 782d703ebc..446bb4574e 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -9,24 +9,24 @@ on: branches: [ master ] jobs: - cypress-run: - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Check for update - run: | - echo "CHANGED=$([[ $(lerna ls --since ${{github.event.before}} | grep nc-gui) = nc-gui ]] && echo 'OK')" >> $GITHUB_ENV - - - name: Cypress run - if: ${{ env.CHANGED == 'OK' }} - uses: cypress-io/github-action@v2 - with: - start: docker-compose -f ./docker-compose-cypress.yml up -d - wait-on: 'http://localhost:3000' - wait-on-timeout: 900 +# cypress-run: +# runs-on: ubuntu-20.04 +# steps: +# - name: Checkout +# uses: actions/checkout@v2 +# with: +# fetch-depth: 0 +# - name: Check for update +# run: | +# echo "CHANGED=$([[ $(lerna ls --since ${{github.event.before}} | grep nc-gui) = nc-gui ]] && echo 'OK')" >> $GITHUB_ENV +# +# - name: Cypress run +# if: ${{ env.CHANGED == 'OK' }} +# uses: cypress-io/github-action@v2 +# with: +# start: docker-compose -f ./docker-compose-cypress.yml up -d +# wait-on: 'http://localhost:3000' +# wait-on-timeout: 900 docker: runs-on: ubuntu-latest steps: diff --git a/packages/nocodb/src/lib/noco/Noco.ts b/packages/nocodb/src/lib/noco/Noco.ts index a0d0b93dad..4c467f2f07 100644 --- a/packages/nocodb/src/lib/noco/Noco.ts +++ b/packages/nocodb/src/lib/noco/Noco.ts @@ -90,7 +90,7 @@ export default class Noco { constructor() { process.env.PORT = process.env.PORT || '8080'; // todo: move - process.env.NC_VERSION = '0011043'; + process.env.NC_VERSION = '0011045'; this.router = express.Router(); this.projectRouter = express.Router(); diff --git a/packages/nocodb/src/lib/noco/upgrader/NcUpgrader.ts b/packages/nocodb/src/lib/noco/upgrader/NcUpgrader.ts index 99626405a0..b02b635421 100644 --- a/packages/nocodb/src/lib/noco/upgrader/NcUpgrader.ts +++ b/packages/nocodb/src/lib/noco/upgrader/NcUpgrader.ts @@ -3,6 +3,7 @@ import { NcConfig } from '../../../interface/config'; import debug from 'debug'; import NcMetaIO from '../meta/NcMetaIO'; import ncProjectEnvUpgrader from './jobs/ncProjectEnvUpgrader'; +import ncProjectEnvUpgrader0011045 from './jobs/ncProjectEnvUpgrader0011045'; const log = debug('nc:upgrader'); @@ -23,7 +24,8 @@ export default class NcUpgrader { const NC_VERSIONS: any[] = [ { name: '0009000', handler: null }, { name: '0009044', handler: null }, - { name: '0011043', handler: ncProjectEnvUpgrader } + { name: '0011043', handler: ncProjectEnvUpgrader }, + { name: '0011045', handler: ncProjectEnvUpgrader0011045 } ]; if (!(await ctx.ncMeta.knexConnection?.schema?.hasTable?.('nc_store'))) { return; diff --git a/packages/nocodb/src/lib/noco/upgrader/jobs/ncProjectEnvUpgrader0011045.ts b/packages/nocodb/src/lib/noco/upgrader/jobs/ncProjectEnvUpgrader0011045.ts new file mode 100644 index 0000000000..54ef96a6bd --- /dev/null +++ b/packages/nocodb/src/lib/noco/upgrader/jobs/ncProjectEnvUpgrader0011045.ts @@ -0,0 +1,11 @@ +import { NcUpgraderCtx } from '../NcUpgrader'; + +export default async function(ctx: NcUpgraderCtx) { + const projects = await ctx.ncMeta.projectList(); + + for (const project of projects) { + const projectConfig = JSON.parse(project.config); + projectConfig.env = '_noco'; + await ctx.ncMeta.projectUpdate(project?.id, projectConfig); + } +}