From c040cd0e7df3ee8b0a1aa9ba182e17fd9e18c532 Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:34:44 +0530 Subject: [PATCH 1/5] chore: ci-cd trigger update Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- .github/workflows/ci-cd.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 5b9eb669a2..5b1e6594a9 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -11,7 +11,7 @@ on: - "packages/nocodb/**" - ".github/workflows/ci-cd.yml" pull_request: - types: [ready_for_review] + types: ['opened', 'edited', 'reopened', 'synchronize', 'ready_for_review'] branches: [develop] paths: - "packages/nc-gui/**" @@ -20,6 +20,7 @@ on: - ".github/workflows/ci-cd.yml" jobs: cypress-restTableOps-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -64,6 +65,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-restViews-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -108,6 +110,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-restRoles-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -152,6 +155,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-restMisc-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -196,6 +200,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restTableOps-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -240,6 +245,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restViews-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -284,6 +290,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restRoles-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -328,6 +335,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restMisc-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -372,6 +380,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restTableOps-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -416,6 +425,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restViews-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -460,6 +470,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restRoles-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -504,6 +515,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restMisc-run-cache: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -548,6 +560,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cy-quick-sqlite: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -593,6 +606,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cy-quick-pg: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -637,6 +651,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 unit-tests: + if: ! github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node From f8ee59b8e64281c0f9912888afe154b3f065b2ea Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:43:10 +0530 Subject: [PATCH 2/5] fix: ci-cd trigger Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- .github/workflows/ci-cd.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 5b1e6594a9..ea3714d8f8 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -11,7 +11,6 @@ on: - "packages/nocodb/**" - ".github/workflows/ci-cd.yml" pull_request: - types: ['opened', 'edited', 'reopened', 'synchronize', 'ready_for_review'] branches: [develop] paths: - "packages/nc-gui/**" From abe984d01f84bd664cb614bf41b53117c0a68c11 Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:48:13 +0530 Subject: [PATCH 3/5] fix: ci-cd trigger Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- .github/workflows/ci-cd.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index ea3714d8f8..f182c474e5 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -19,7 +19,7 @@ on: - ".github/workflows/ci-cd.yml" jobs: cypress-restTableOps-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -64,7 +64,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-restViews-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -109,7 +109,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-restRoles-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -154,7 +154,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-restMisc-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -199,7 +199,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restTableOps-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -244,7 +244,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restViews-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -289,7 +289,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restRoles-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -334,7 +334,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restMisc-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -379,7 +379,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restTableOps-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -424,7 +424,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restViews-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -469,7 +469,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restRoles-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -514,7 +514,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restMisc-run-cache: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -559,7 +559,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cy-quick-sqlite: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -605,7 +605,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cy-quick-pg: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node @@ -650,7 +650,7 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 unit-tests: - if: ! github.event.pull_request.draft + if: !github.event.pull_request.draft runs-on: ubuntu-20.04 steps: - name: Setup Node From 0c5bb808e0336f7c5c2e3b5ec669a6bf8dbb44c5 Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:54:10 +0530 Subject: [PATCH 4/5] fix: ci-cd trigger Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- .github/workflows/ci-cd.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index f182c474e5..e6670bf112 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -19,8 +19,8 @@ on: - ".github/workflows/ci-cd.yml" jobs: cypress-restTableOps-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -64,8 +64,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-restViews-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -109,8 +109,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-restRoles-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -154,8 +154,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-restMisc-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -199,8 +199,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restTableOps-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -244,8 +244,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restViews-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -289,8 +289,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restRoles-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -334,8 +334,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-xcdb-restMisc-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -379,8 +379,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restTableOps-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -424,8 +424,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restViews-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -469,8 +469,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restRoles-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -514,8 +514,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cypress-pg-restMisc-run-cache: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -559,8 +559,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cy-quick-sqlite: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -605,8 +605,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 cy-quick-pg: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 @@ -650,8 +650,8 @@ jobs: path: scripts/cypress/screenshots retention-days: 2 unit-tests: - if: !github.event.pull_request.draft runs-on: ubuntu-20.04 + if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }} steps: - name: Setup Node uses: actions/setup-node@v1 From d8d116232997ac1d3b272fabe241ed36b1b12953 Mon Sep 17 00:00:00 2001 From: Raju Udava <86527202+dstala@users.noreply.github.com> Date: Thu, 22 Sep 2022 16:56:43 +0530 Subject: [PATCH 5/5] chore: comments updated Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> --- .github/workflows/ci-cd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index e6670bf112..914a0406b5 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -1,5 +1,6 @@ # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions +# Trigger configuration : https://gist.github.com/myobie/671d2f2a1e503efa0c05e7b865c26a9d name: "CI/CD" on: