From 94ad1d68ab5e245fc81b003c2e67a386b50f97d4 Mon Sep 17 00:00:00 2001 From: mertmit Date: Wed, 14 Aug 2024 17:10:33 +0300 Subject: [PATCH 1/2] chore: revert temp action change Signed-off-by: mertmit --- .github/workflows/release-npm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml index 7e19ef5cd2..b5672974b0 100644 --- a/.github/workflows/release-npm.yml +++ b/.github/workflows/release-npm.yml @@ -61,8 +61,8 @@ jobs: fi echo $NOCODB_SDK_PKG_NAME targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js && - # pnpm --filter=${NOCODB_SDK_PKG_NAME} install --ignore-scripts --no-frozen-lockfile --ignore-workspace && pnpm --filter=${NOCODB_SDK_PKG_NAME} run build && pnpm --filter=${NOCODB_SDK_PKG_NAME} publish --no-git-checks && - # sleep 90 && + pnpm --filter=${NOCODB_SDK_PKG_NAME} install --ignore-scripts --no-frozen-lockfile --ignore-workspace && pnpm --filter=${NOCODB_SDK_PKG_NAME} run build && pnpm --filter=${NOCODB_SDK_PKG_NAME} publish --no-git-checks && + sleep 90 && 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 && pnpm --filter=nc-gui install --ignore-scripts --no-frozen-lockfile && From 89ffd19771c95e32f296859992e7fadb8c165be6 Mon Sep 17 00:00:00 2001 From: mertmit Date: Wed, 14 Aug 2024 17:18:49 +0300 Subject: [PATCH 2/2] chore: remove commented code Signed-off-by: mertmit --- README.md | 5 ----- markdown/readme/languages/chinese.md | 3 --- markdown/readme/languages/indonesian.md | 5 ----- markdown/readme/languages/ukrainian.md | 5 ----- packages/nocodb/README.md | 5 ----- .../src/modules/jobs/jobs/export-import/import.service.ts | 2 +- 6 files changed, 1 insertion(+), 24 deletions(-) diff --git a/README.md b/README.md index cbcd62d737..640fed6ca0 100644 --- a/README.md +++ b/README.md @@ -59,11 +59,6 @@ Turns any MySQL, PostgreSQL, SQL Server, SQLite & MariaDB into a smart spreadshe - - [![Stargazers repo roster for @nocodb/nocodb](http://reporoster.com/stars/nocodb/nocodb)](https://github.com/nocodb/nocodb/stargazers) # Quick try diff --git a/markdown/readme/languages/chinese.md b/markdown/readme/languages/chinese.md index a78d500fa5..f1c91fb2c8 100644 --- a/markdown/readme/languages/chinese.md +++ b/markdown/readme/languages/chinese.md @@ -93,9 +93,6 @@ cd nocodb/docker-compose/pg - - - # 截图 diff --git a/markdown/readme/languages/indonesian.md b/markdown/readme/languages/indonesian.md index 9e4ed71319..827bc0dde5 100644 --- a/markdown/readme/languages/indonesian.md +++ b/markdown/readme/languages/indonesian.md @@ -48,11 +48,6 @@ Mengubah MySQL, PostgreSQL, SQL Server, SQLite & MariaDB apapun menjadi spreadsh - - [![Stargazers repo roster for @nocodb/nocodb](https://reporoster.com/stars/nocodb/nocodb)](https://github.com/nocodb/nocodb/stargazers) # Coba singkat diff --git a/markdown/readme/languages/ukrainian.md b/markdown/readme/languages/ukrainian.md index d27f6a923a..df04f274a7 100644 --- a/markdown/readme/languages/ukrainian.md +++ b/markdown/readme/languages/ukrainian.md @@ -58,11 +58,6 @@ Nocodb перетворює будь-яку базу даних MySQL, PostgreSQ - - [![Stargazers repo roster for @nocodb/nocodb](http://reporoster.com/stars/nocodb/nocodb)](https://github.com/nocodb/nocodb/stargazers) # Швидка спроба проекту diff --git a/packages/nocodb/README.md b/packages/nocodb/README.md index 15e167de6b..ac12480b84 100644 --- a/packages/nocodb/README.md +++ b/packages/nocodb/README.md @@ -59,11 +59,6 @@ Turns any MySQL, PostgreSQL, SQL Server, SQLite & MariaDB into a smart spreadshe - - [![Stargazers repo roster for @nocodb/nocodb](https://reporoster.com/stars/nocodb/nocodb)](https://github.com/nocodb/nocodb/stargazers) # Quick try diff --git a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts index 67b5f2abeb..37cdfdf7ab 100644 --- a/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts +++ b/packages/nocodb/src/modules/jobs/jobs/export-import/import.service.ts @@ -1451,7 +1451,7 @@ export class ImportService { elapsedTime(hrTime, 'create views', 'importModels'); - // create hooks filters + // create hook filters for hooks for (const data of param.data) { if (param.existingModel) break; if (!data?.hooks) break;