From 36119319b95764e6acebd18d65b33a3874f05700 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 27 Jun 2022 18:59:26 +0530 Subject: [PATCH 1/2] chore: make sdk script part of run script to run them sequentially Signed-off-by: Pranav C --- .github/workflows/ci-cd.yml | 12 ------------ package.json | 12 ++++++------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 02d321f178..25793d026f 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -49,7 +49,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:api:cache npm run start:web docker-compose -f ./scripts/cypress/docker-compose-pg.yml up -d @@ -94,7 +93,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:api:cache npm run start:web docker-compose -f ./scripts/cypress/docker-compose-pg.yml up -d @@ -139,7 +137,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:api:cache npm run start:web docker-compose -f ./scripts/cypress/docker-compose-pg.yml up -d @@ -184,7 +181,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:api:cache npm run start:web docker-compose -f ./scripts/cypress/docker-compose-pg.yml up -d @@ -229,7 +225,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:api:cache npm run start:web docker-compose -f ./scripts/docker-compose-cypress.yml up -d @@ -274,7 +269,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:api:cache npm run start:web docker-compose -f ./scripts/docker-compose-cypress.yml up -d @@ -319,7 +313,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:api:cache npm run start:web docker-compose -f ./scripts/docker-compose-cypress.yml up -d @@ -364,7 +357,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:api:cache npm run start:web docker-compose -f ./scripts/docker-compose-cypress.yml up -d @@ -409,7 +401,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:xcdb-api:cache npm run start:web docker-compose -f ./scripts/docker-compose-cypress.yml up -d @@ -454,7 +445,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:xcdb-api:cache npm run start:web docker-compose -f ./scripts/docker-compose-cypress.yml up -d @@ -499,7 +489,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:xcdb-api:cache npm run start:web docker-compose -f ./scripts/docker-compose-cypress.yml up -d @@ -544,7 +533,6 @@ jobs: uses: cypress-io/github-action@v2 with: start: | - npm run build:common npm run start:xcdb-api:cache npm run start:web docker-compose -f ./scripts/docker-compose-cypress.yml up -d diff --git a/package.json b/package.json index 579c3db173..d9e2159799 100644 --- a/package.json +++ b/package.json @@ -15,12 +15,12 @@ "scripts": { "build:common": "cd ./packages/nocodb-sdk; npm install; npm run build", "install:common": "cd ./packages/nocodb; npm install ../nocodb-sdk; cd ../nc-gui; npm install ../nocodb-sdk", - "start:api": "cd ./packages/nocodb; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true npm run watch:run:cypress", - "start:xcdb-api": "cd ./packages/nocodb; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress", - "start:api:cache": "cd ./packages/nocodb; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress", - "start:api:cache:pg": "cd ./packages/nocodb; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg", - "start:xcdb-api:cache": "cd ./packages/nocodb; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress", - "start:web": "cd ./packages/nc-gui; npm install; npm run dev", + "start:api": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true npm run watch:run:cypress", + "start:xcdb-api": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress", + "start:api:cache": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_TELE=true npm run watch:run:cypress", + "start:api:cache:pg": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg", + "start:xcdb-api:cache": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress", + "start:web": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nc-gui; npm install ../nocodb-sdk; npm install; npm run dev", "cypress:run": "cypress run --config-file ./scripts/cypress/cypress.json", "cypress:open": "cypress open --config-file ./scripts/cypress/cypress.json", "cypress:clear": "cypress cache clear", From fccc159ff6c0b83468f0d3df2ccbd5cbc32a87a8 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 27 Jun 2022 19:45:19 +0530 Subject: [PATCH 2/2] chore: path correction Signed-off-by: Pranav C --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d9e2159799..602192d780 100644 --- a/package.json +++ b/package.json @@ -15,12 +15,12 @@ "scripts": { "build:common": "cd ./packages/nocodb-sdk; npm install; npm run build", "install:common": "cd ./packages/nocodb; npm install ../nocodb-sdk; cd ../nc-gui; npm install ../nocodb-sdk", - "start:api": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true npm run watch:run:cypress", - "start:xcdb-api": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress", - "start:api:cache": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_TELE=true npm run watch:run:cypress", - "start:api:cache:pg": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg", - "start:xcdb-api:cache": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress", - "start:web": "cd ./packages/nocodb-sdk; npm install; npm run build ; cd ./nc-gui; npm install ../nocodb-sdk; npm install; npm run dev", + "start:api": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true npm run watch:run:cypress", + "start:xcdb-api": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_CACHE=true NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress", + "start:api:cache": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk;npm install; NC_DISABLE_TELE=true npm run watch:run:cypress", + "start:api:cache:pg": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true npm run watch:run:cypress:pg", + "start:xcdb-api:cache": "npm run build:common ; cd ./packages/nocodb; npm install ../nocodb-sdk; npm install; NC_DISABLE_TELE=true NC_INFLECTION=camelize DATABASE_URL=sqlite:../../../scripts/cypress/fixtures/sqlite-sakila/sakila.db npm run watch:run:cypress", + "start:web": "npm run build:common ; cd ./packages/nc-gui; npm install ../nocodb-sdk; npm install; npm run dev", "cypress:run": "cypress run --config-file ./scripts/cypress/cypress.json", "cypress:open": "cypress open --config-file ./scripts/cypress/cypress.json", "cypress:clear": "cypress cache clear",