diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index ffa1250480..ce8c3e689d 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -58,10 +58,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-pg-restViews-run-cache:
runs-on: ubuntu-20.04
@@ -102,10 +103,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-pg-restRoles-run-cache:
runs-on: ubuntu-20.04
@@ -146,10 +148,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-pg-restMisc-run-cache:
runs-on: ubuntu-20.04
@@ -190,10 +193,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-restTableOps-run-cache:
runs-on: ubuntu-20.04
@@ -225,7 +229,7 @@ jobs:
uses: cypress-io/github-action@v2
with:
start: |
- npm run build:common
+ npm run build:common
npm run start:api:cache
npm run start:web
docker-compose -f ./scripts/docker-compose-cypress.yml up -d
@@ -234,10 +238,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-restViews-run-cache:
runs-on: ubuntu-20.04
@@ -278,10 +283,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-restRoles-run-cache:
runs-on: ubuntu-20.04
@@ -322,10 +328,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-restMisc-run-cache:
runs-on: ubuntu-20.04
@@ -366,10 +373,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-xcdb-restTableOps-run-cache:
runs-on: ubuntu-20.04
@@ -410,10 +418,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-xcdb-restViews-run-cache:
runs-on: ubuntu-20.04
@@ -454,10 +463,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-xcdb-restRoles-run-cache:
runs-on: ubuntu-20.04
@@ -498,10 +508,11 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
cypress-xcdb-restMisc-run-cache:
runs-on: ubuntu-20.04
@@ -542,38 +553,39 @@ jobs:
wait-on-timeout: 1200
config-file: scripts/cypress/cypress.json
- name: Upload screenshots
+ if: always()
uses: actions/upload-artifact@v2
with:
name: restTableOps-snapshots
- path: scripts/cypress/videos
+ path: scripts/cypress/screenshots
retention-days: 2
- docker:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- with:
- fetch-depth: 0
- - name: Check for update
- run: |
- echo "CHANGED=$([[ $(lerna ls --since ${{github.event.before}} | grep nocodb) = nocodb ]] && echo 'OK')" >> $GITHUB_ENV
- - name: Test Mysql REST APIs
- if: ${{ env.CHANGED == 'OK' }}
- run: cd ./packages/nocodb/ && docker-compose run xc-test-mysql
- - name: Test Mysql GraphQL APIs
- if: ${{ env.CHANGED == 'OK' }}
- run: cd ./packages/nocodb/ && docker-compose run xc-test-gql-mysql
-
- # - name: Test MSSQL REST APIs
- # run: cd ./packages/nocodb/ && docker-compose run xc-test-mssql
- # - name: Test MSSQL GraphQL APIs
- # run: cd ./packages/nocodb/ && docker-compose run xc-test-gql-mssql
- #
- - name: Test PostgreSQL REST APIs
- if: ${{ env.CHANGED == 'OK' }}
- run: cd ./packages/nocodb/ && docker-compose run xc-test-pg
- - name: Test PostgreSQL GraphQL APIs
- if: ${{ env.CHANGED == 'OK' }}
- run: cd ./packages/nocodb/ && docker-compose run xc-test-gql-pg
+# docker:
+# runs-on: ubuntu-latest
+# steps:
+# - uses: actions/checkout@v2
+# with:
+# fetch-depth: 0
+# - name: Check for update
+# run: |
+# echo "CHANGED=$([[ $(lerna ls --since ${{github.event.before}} | grep nocodb) = nocodb ]] && echo 'OK')" >> $GITHUB_ENV
+# - name: Test Mysql REST APIs
+# if: ${{ env.CHANGED == 'OK' }}
+# run: cd ./packages/nocodb/ && docker-compose run xc-test-mysql
+# - name: Test Mysql GraphQL APIs
+# if: ${{ env.CHANGED == 'OK' }}
+# run: cd ./packages/nocodb/ && docker-compose run xc-test-gql-mysql
+#
+# # - name: Test MSSQL REST APIs
+# # run: cd ./packages/nocodb/ && docker-compose run xc-test-mssql
+# # - name: Test MSSQL GraphQL APIs
+# # run: cd ./packages/nocodb/ && docker-compose run xc-test-gql-mssql
+# #
+# - name: Test PostgreSQL REST APIs
+# if: ${{ env.CHANGED == 'OK' }}
+# run: cd ./packages/nocodb/ && docker-compose run xc-test-pg
+# - name: Test PostgreSQL GraphQL APIs
+# if: ${{ env.CHANGED == 'OK' }}
+# run: cd ./packages/nocodb/ && docker-compose run xc-test-gql-pg
#
# - name: Test SQLite3 REST APIs
# run: cd ./packages/nocodb/ && docker-compose run xc-test-sqlite
diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
index 0fb8da4fbf..093f064809 100644
--- a/.github/workflows/release-docker.yml
+++ b/.github/workflows/release-docker.yml
@@ -42,7 +42,7 @@ jobs:
working-directory: ./packages/nocodb
strategy:
matrix:
- node-version: [12]
+ node-version: [14]
steps:
- name: Get Docker Repository
id: get-docker-repository
@@ -73,6 +73,20 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
+ - name: upgrade packages for nightly build
+ if: ${{ github.event.inputs.targetEnv == 'DEV' || inputs.targetEnv == 'DEV' }}
+ run: |
+ targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js
+ cd packages/nocodb-sdk
+ npm install && npm run build
+ cd ../..
+ targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNocodbSdk.js
+ cd packages/nc-gui
+ npm install
+ targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} npm run build:copy
+ cd ../..
+ targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNcGui.js
+
- uses: bahmutov/npm-install@v1
with:
working-directory: ${{ env.working-directory }}
diff --git a/.github/workflows/release-nightly-dev.yml b/.github/workflows/release-nightly-dev.yml
index 8485655feb..6cbbe5ab08 100644
--- a/.github/workflows/release-nightly-dev.yml
+++ b/.github/workflows/release-nightly-dev.yml
@@ -12,8 +12,8 @@ on:
- DEV
# - PROD
schedule:
- # at the end of every day
- - cron: '0 0 * * *'
+ # every 6 hours
+ - cron: '0 */6 * * *'
jobs:
# enrich tag for nightly auto release
@@ -26,11 +26,11 @@ jobs:
# Get current date
CURRENT_DATE=$(date +"%Y%m%d")
CURRENT_TIME=$(date +"%H%M")
- TAG_NAME=${CURRENT_DATE}
+ TAG_NAME=${CURRENT_DATE}-${CURRENT_TIME}
IS_DAILY='Y'
# Set the tag
if [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then
- TAG_NAME=${TAG_NAME}-${CURRENT_TIME}
+ TAG_NAME=${TAG_NAME}
IS_DAILY='N'
fi
echo "::set-output name=NIGHTLY_BUILD_TAG::${TAG_NAME}"
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
index b2bbf985e6..024e23f59a 100644
--- a/.github/workflows/release-npm.yml
+++ b/.github/workflows/release-npm.yml
@@ -37,27 +37,27 @@ jobs:
working-directory: ./packages/nocodb
strategy:
matrix:
- node-version: [12]
+ node-version: [14]
steps:
- - uses: actions/checkout@v2
- # Setup .npmrc file to publish to npm
- - uses: actions/setup-node@v2
+ - name: Checkout
+ uses: actions/checkout@v2
+ - name: NPM Setup and Publish with ${{ matrix.node-version }}
+ # Setup .npmrc file to publish to npm
+ uses: actions/setup-node@v2
with:
- node-version: '16.x'
+ node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
- run: |
+ targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js
cd packages/nocodb-sdk
- targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node ../../scripts/bumpNocodbSdkVersion.js
- npm install && npm run build
- npm publish
+ npm install && npm run build && npm publish
cd ../..
targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNocodbSdk.js
cd packages/nc-gui
npm install
targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} npm run build:copy:jsdeliver
cd ../..
- npm install
- targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/upgradeNcGui.js && cd packages/nocodb && npm install && npm run obfuscate:build:publish
+ targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNcGui.js && cd packages/nocodb && npm install && npm run obfuscate:build:publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Create Pull Request
diff --git a/.run/Clear metadb.run.xml b/.run/Clear metadb.run.xml
new file mode 100644
index 0000000000..2fc4fdd987
--- /dev/null
+++ b/.run/Clear metadb.run.xml
@@ -0,0 +1,5 @@
+