From 782f595d2a7d4ae1973bfe68084052cdd9098654 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Wed, 18 Dec 2024 17:36:33 +0530 Subject: [PATCH 01/31] e2e github actions --- .github/workflows/web-test-e2e.yml | 34 +++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 72361ec85fb..218f68f05e2 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -42,6 +42,25 @@ jobs: - "runtime/**" - "web-common/**" + - name: Evaluate e2e tests matrix + id: matrix + run: | + echo "::set-output name=matrix::$(jq -n '{ + include: [ + {"name": "admin"} | select(env.FILTER_ADMIN == "true" && env.FILTER_COMMON == "true"), + {"name": "local"} | select(env.FILTER_LOCAL == "true" && env.FILTER_COMMON == "true") + ] + }')" + env: + FILTER_ADMIN: ${{ steps.filter.outputs.admin }} + FILTER_COMMON: ${{ steps.filter.outputs.common }} + FILTER_LOCAL: ${{ steps.filter.outputs.local }} + + e2e: + runs-on: ubuntu-latest + strategy: + matrix: ${{ fromJson(needs.build.outputs.matrix) }} + steps: - name: Set up NodeJS uses: actions/setup-node@v4 with: @@ -76,19 +95,14 @@ jobs: - name: Install browser for UI tests run: npx playwright install - - name: Test `web-local` - if: ${{ steps.filter.outputs.local == 'true' || steps.filter.outputs.common == 'true' }} - run: npm run test -w web-local + - name: Test ${{ matrix.name }} + run: |- + npm run build -w ${{ matrix.name }} + npm run test -w ${{ matrix.name }} - uses: actions/upload-artifact@v4 if: always() with: name: playwright-report - path: web-local/playwright-report/ + path: ${{ matrix.name }}/playwright-report/ retention-days: 30 - - - name: Build and test `web-admin` - if: ${{ steps.filter.outputs.admin == 'true' || steps.filter.outputs.common == 'true' }} - run: |- - npm run build -w web-admin - npm run test -w web-admin From f7c6cc5a8655677aea2ae95c28277734145ab13e Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Wed, 18 Dec 2024 17:37:00 +0530 Subject: [PATCH 02/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 218f68f05e2..147d7da7375 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -2,7 +2,7 @@ name: End-to-end tests of web+runtime on: pull_request: paths: - - ".github/workflows/web-test.yml" + - ".github/workflows/web-test-e2e.yml" - "admin/**" - "cli/**" - "runtime/**" From de0b285db245cae89a38beffcc36fae01c126f5d Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Wed, 18 Dec 2024 17:41:48 +0530 Subject: [PATCH 03/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 147d7da7375..3279e8a31de 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -47,8 +47,8 @@ jobs: run: | echo "::set-output name=matrix::$(jq -n '{ include: [ - {"name": "admin"} | select(env.FILTER_ADMIN == "true" && env.FILTER_COMMON == "true"), - {"name": "local"} | select(env.FILTER_LOCAL == "true" && env.FILTER_COMMON == "true") + {"name": "admin"} | select(env.FILTER_ADMIN == "true" and env.FILTER_COMMON == "true"), + {"name": "local"} | select(env.FILTER_LOCAL == "true" and env.FILTER_COMMON == "true") ] }')" env: From 2874c98a69635e9625fd8eca74cb2096810e8a36 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Wed, 18 Dec 2024 17:43:14 +0530 Subject: [PATCH 04/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 3279e8a31de..afccc386026 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -23,21 +23,21 @@ jobs: with: filters: | admin: - - ".github/workflows/web-test.yml" + - ".github/workflows/web-test-e2e.yml" - "admin/**" - "cli/**" - "runtime/**" - "web-admin/**" auth: - - ".github/workflows/web-test.yml" + - ".github/workflows/web-test-e2e.yml" - "web-auth/**" local: - - ".github/workflows/web-test.yml" + - ".github/workflows/web-test-e2e.yml" - "cli/**" - "runtime/**" - "web-local/**" common: - - ".github/workflows/web-test.yml" + - ".github/workflows/web-test-e2e.yml" - "cli/**" - "runtime/**" - "web-common/**" From 0949768e65f151a952c1884b98fd0f2968edd1d6 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Wed, 18 Dec 2024 17:50:10 +0530 Subject: [PATCH 05/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index afccc386026..ba27c79a24b 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -45,12 +45,10 @@ jobs: - name: Evaluate e2e tests matrix id: matrix run: | - echo "::set-output name=matrix::$(jq -n '{ - include: [ - {"name": "admin"} | select(env.FILTER_ADMIN == "true" and env.FILTER_COMMON == "true"), - {"name": "local"} | select(env.FILTER_LOCAL == "true" and env.FILTER_COMMON == "true") - ] - }')" + echo "name=$(jq -n '[ + "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), + "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") + ]')" >> "$GITHUB_OUTPUT" env: FILTER_ADMIN: ${{ steps.filter.outputs.admin }} FILTER_COMMON: ${{ steps.filter.outputs.common }} @@ -59,7 +57,8 @@ jobs: e2e: runs-on: ubuntu-latest strategy: - matrix: ${{ fromJson(needs.build.outputs.matrix) }} + matrix: + name: ${{ fromJson(needs.build.outputs.matrix) }} steps: - name: Set up NodeJS uses: actions/setup-node@v4 From 22c87ece77fc9cfc81165bf055f07b85c0f68820 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 13:32:57 +0530 Subject: [PATCH 06/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index ba27c79a24b..3cab060f47f 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -48,7 +48,7 @@ jobs: echo "name=$(jq -n '[ "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") - ]')" >> "$GITHUB_OUTPUT" + ]' | jq -c)" >> "$GITHUB_OUTPUT" env: FILTER_ADMIN: ${{ steps.filter.outputs.admin }} FILTER_COMMON: ${{ steps.filter.outputs.common }} From e9656299ed7a38818a249903da30495cafadb77d Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 13:34:52 +0530 Subject: [PATCH 07/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 3cab060f47f..8dcbd71e46f 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -45,6 +45,10 @@ jobs: - name: Evaluate e2e tests matrix id: matrix run: | + echo "name=$(jq -n '[ + "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), + "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") + ]' | jq -c)" echo "name=$(jq -n '[ "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") From 044e0fb1617b0b21cd6f7b30cc39b3010978f3ac Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 13:37:30 +0530 Subject: [PATCH 08/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 8dcbd71e46f..2270e58eaeb 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -45,10 +45,6 @@ jobs: - name: Evaluate e2e tests matrix id: matrix run: | - echo "name=$(jq -n '[ - "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), - "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") - ]' | jq -c)" echo "name=$(jq -n '[ "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") @@ -58,11 +54,17 @@ jobs: FILTER_COMMON: ${{ steps.filter.outputs.common }} FILTER_LOCAL: ${{ steps.filter.outputs.local }} + - name: print + run: |- + echo ${{ needs.build.outputs.name }} + echo ${{ fromJson(needs.build.outputs.name) }} + echo ${{ fromJson(needs.build.outputs.name) }} | jq + e2e: runs-on: ubuntu-latest strategy: matrix: - name: ${{ fromJson(needs.build.outputs.matrix) }} + name: ${{ fromJson(needs.build.outputs.name) }} steps: - name: Set up NodeJS uses: actions/setup-node@v4 From ef693d6dbb7ee99bd69b64298052ace641447c5b Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 13:39:19 +0530 Subject: [PATCH 09/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 2270e58eaeb..c7a92716bee 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -13,6 +13,9 @@ on: jobs: build: runs-on: ubuntu-latest + outputs: + name: ${{ steps.matrix.outputs.name }} + steps: - name: Checkout code uses: actions/checkout@v4 From fe9f1d58c42b5c2da8f157a8743dbb6232a2151b Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 13:40:48 +0530 Subject: [PATCH 10/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index c7a92716bee..ef424f891ea 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -59,9 +59,9 @@ jobs: - name: print run: |- - echo ${{ needs.build.outputs.name }} - echo ${{ fromJson(needs.build.outputs.name) }} - echo ${{ fromJson(needs.build.outputs.name) }} | jq + echo ${{ steps.matrix.outputs.name }} + echo ${{ fromJson(steps.matrix.outputs.name) }} + echo ${{ fromJson(steps.matrix.outputs.name) }} | jq e2e: runs-on: ubuntu-latest From 934cfe719985bc6d2dd460bdc349362138fb7940 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 13:43:46 +0530 Subject: [PATCH 11/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index ef424f891ea..20bea6932fd 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -57,12 +57,6 @@ jobs: FILTER_COMMON: ${{ steps.filter.outputs.common }} FILTER_LOCAL: ${{ steps.filter.outputs.local }} - - name: print - run: |- - echo ${{ steps.matrix.outputs.name }} - echo ${{ fromJson(steps.matrix.outputs.name) }} - echo ${{ fromJson(steps.matrix.outputs.name) }} | jq - e2e: runs-on: ubuntu-latest strategy: From d9f07a84d00d7dda313d9ab23a27cb36cbc96023 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 13:46:55 +0530 Subject: [PATCH 12/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 20bea6932fd..bf9eada48c6 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -61,8 +61,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - name: ${{ fromJson(needs.build.outputs.name) }} + name: ["admin","local"] steps: + - name: print + run: |- + echo "name: ${{ fromJson(needs.build.outputs.name) }}" + - name: Set up NodeJS uses: actions/setup-node@v4 with: @@ -72,6 +76,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: 1.23 + - name: go build cache uses: actions/cache@v4 with: From 44bf655ce5bd5cccacfd60341d76a4a6b9112ff5 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 13:48:36 +0530 Subject: [PATCH 13/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index bf9eada48c6..5865ec04dbd 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -65,7 +65,7 @@ jobs: steps: - name: print run: |- - echo "name: ${{ fromJson(needs.build.outputs.name) }}" + echo "name: ${{ needs.build.outputs.name }}" - name: Set up NodeJS uses: actions/setup-node@v4 From e7d6ac7f04a075fd61550f4680e7412777af3199 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 14:14:11 +0530 Subject: [PATCH 14/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 5865ec04dbd..6dc239cd19d 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -14,7 +14,7 @@ jobs: build: runs-on: ubuntu-latest outputs: - name: ${{ steps.matrix.outputs.name }} + matrix: ${{ steps.matrix.outputs.matrix }} steps: - name: Checkout code @@ -48,7 +48,7 @@ jobs: - name: Evaluate e2e tests matrix id: matrix run: | - echo "name=$(jq -n '[ + echo "matrix=$(jq -n '[ "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") ]' | jq -c)" >> "$GITHUB_OUTPUT" @@ -57,6 +57,9 @@ jobs: FILTER_COMMON: ${{ steps.filter.outputs.common }} FILTER_LOCAL: ${{ steps.filter.outputs.local }} + - name: print + run: |- + echo ${{ steps.matrix.outputs.matrix }} e2e: runs-on: ubuntu-latest strategy: @@ -65,7 +68,8 @@ jobs: steps: - name: print run: |- - echo "name: ${{ needs.build.outputs.name }}" + echo "name: ${{ needs.build.outputs }}" + echo "name: ${{ needs.build.outputs.matrix }}" - name: Set up NodeJS uses: actions/setup-node@v4 From 0076985acb14d82050cc2cd3fcb0eb5cb6f6633e Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 14:21:09 +0530 Subject: [PATCH 15/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 6dc239cd19d..ddb12c88566 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -49,9 +49,9 @@ jobs: id: matrix run: | echo "matrix=$(jq -n '[ - "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), - "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") - ]' | jq -c)" >> "$GITHUB_OUTPUT" + {"name": "admin"} | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), + {"name": "local"} | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") + ]')" >> "$GITHUB_OUTPUT" env: FILTER_ADMIN: ${{ steps.filter.outputs.admin }} FILTER_COMMON: ${{ steps.filter.outputs.common }} From 024b55addddbf07ce0cd65c32300cd29c9b9a39a Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 14:22:25 +0530 Subject: [PATCH 16/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index ddb12c88566..78bbe587782 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -49,9 +49,9 @@ jobs: id: matrix run: | echo "matrix=$(jq -n '[ - {"name": "admin"} | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), - {"name": "local"} | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") - ]')" >> "$GITHUB_OUTPUT" + "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), + "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") + ]' | jq -c)" >> "$GITHUB_OUTPUT" env: FILTER_ADMIN: ${{ steps.filter.outputs.admin }} FILTER_COMMON: ${{ steps.filter.outputs.common }} @@ -62,6 +62,7 @@ jobs: echo ${{ steps.matrix.outputs.matrix }} e2e: runs-on: ubuntu-latest + needs: build strategy: matrix: name: ["admin","local"] From 456ed4b038b8914f7af16caafe9c9a0cd889759d Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 14:24:13 +0530 Subject: [PATCH 17/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 78bbe587782..08799ebfcfb 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -57,21 +57,13 @@ jobs: FILTER_COMMON: ${{ steps.filter.outputs.common }} FILTER_LOCAL: ${{ steps.filter.outputs.local }} - - name: print - run: |- - echo ${{ steps.matrix.outputs.matrix }} e2e: runs-on: ubuntu-latest needs: build strategy: matrix: - name: ["admin","local"] + name: ${{ fromJson(needs.build.outputs.matrix) }} steps: - - name: print - run: |- - echo "name: ${{ needs.build.outputs }}" - echo "name: ${{ needs.build.outputs.matrix }}" - - name: Set up NodeJS uses: actions/setup-node@v4 with: From 89c93aa04564f4a89344bf1d650fc7669e0c183e Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 14:33:02 +0530 Subject: [PATCH 18/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 08799ebfcfb..eed19291386 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -74,6 +74,9 @@ jobs: with: go-version: 1.23 + - name: Checkout code + uses: actions/checkout@v4 + - name: go build cache uses: actions/cache@v4 with: From 7217dbd13ba1ccfc14334d33cdf38d3d344d9ea7 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 14:47:45 +0530 Subject: [PATCH 19/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index eed19291386..7b31de56ba8 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -49,8 +49,8 @@ jobs: id: matrix run: | echo "matrix=$(jq -n '[ - "admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), - "local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") + "web-admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), + "web-local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") ]' | jq -c)" >> "$GITHUB_OUTPUT" env: FILTER_ADMIN: ${{ steps.filter.outputs.admin }} From d80b84e4e9938ee5402371dc1d981b067976637a Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 14:58:45 +0530 Subject: [PATCH 20/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 7b31de56ba8..b2fd0122149 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -102,6 +102,16 @@ jobs: - name: Install browser for UI tests run: npx playwright install + - name: Authenticate GCloud + uses: google-github-actions/auth@v2 + if: ${{ matrix.name }} == "web-admin" + with: + credentials_json: "${{ secrets.RILL_BINARY_SA }}" + + - name: Set up GCloud SDK + if: ${{ matrix.name }} == "web-admin" + uses: google-github-actions/setup-gcloud@v2 + - name: Test ${{ matrix.name }} run: |- npm run build -w ${{ matrix.name }} From cfab268c9f66833cb49aa0a98d283afba3e3ccb0 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 17:20:06 +0530 Subject: [PATCH 21/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index b2fd0122149..7b26fce1554 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -112,6 +112,11 @@ jobs: if: ${{ matrix.name }} == "web-admin" uses: google-github-actions/setup-gcloud@v2 + - name: gTest ${{ matrix.name }} + if: ${{ matrix.name }} == "web-admin" + run: |- + gsutil ls gs://rill-devtool/dotenv/ + - name: Test ${{ matrix.name }} run: |- npm run build -w ${{ matrix.name }} From 014797f8213c1688727f960c03a14456ec47534a Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 17:21:29 +0530 Subject: [PATCH 22/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 7b26fce1554..18ed91f94c5 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -64,6 +64,21 @@ jobs: matrix: name: ${{ fromJson(needs.build.outputs.matrix) }} steps: + - name: Authenticate GCloud + uses: google-github-actions/auth@v2 + if: ${{ matrix.name }} == "web-admin" + with: + credentials_json: "${{ secrets.RILL_BINARY_SA }}" + + - name: Set up GCloud SDK + if: ${{ matrix.name }} == "web-admin" + uses: google-github-actions/setup-gcloud@v2 + + - name: gTest ${{ matrix.name }} + if: ${{ matrix.name }} == "web-admin" + run: |- + gsutil ls gs://rill-devtool/dotenv/ + - name: Set up NodeJS uses: actions/setup-node@v4 with: @@ -102,21 +117,6 @@ jobs: - name: Install browser for UI tests run: npx playwright install - - name: Authenticate GCloud - uses: google-github-actions/auth@v2 - if: ${{ matrix.name }} == "web-admin" - with: - credentials_json: "${{ secrets.RILL_BINARY_SA }}" - - - name: Set up GCloud SDK - if: ${{ matrix.name }} == "web-admin" - uses: google-github-actions/setup-gcloud@v2 - - - name: gTest ${{ matrix.name }} - if: ${{ matrix.name }} == "web-admin" - run: |- - gsutil ls gs://rill-devtool/dotenv/ - - name: Test ${{ matrix.name }} run: |- npm run build -w ${{ matrix.name }} From 69ac4304b9d892351afdef421d1fc0ab244666d6 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 17:30:11 +0530 Subject: [PATCH 23/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 18ed91f94c5..575ec3a45f5 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -66,16 +66,16 @@ jobs: steps: - name: Authenticate GCloud uses: google-github-actions/auth@v2 - if: ${{ matrix.name }} == "web-admin" + if: matrix.name == "web-admin" with: credentials_json: "${{ secrets.RILL_BINARY_SA }}" - name: Set up GCloud SDK - if: ${{ matrix.name }} == "web-admin" + if: matrix.name == "web-admin" uses: google-github-actions/setup-gcloud@v2 - name: gTest ${{ matrix.name }} - if: ${{ matrix.name }} == "web-admin" + if: matrix.name == "web-admin" run: |- gsutil ls gs://rill-devtool/dotenv/ From 8728a69d7b6c709bf409b28c80746e43bd877cac Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 17:32:17 +0530 Subject: [PATCH 24/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 575ec3a45f5..653a7a28e76 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -66,16 +66,16 @@ jobs: steps: - name: Authenticate GCloud uses: google-github-actions/auth@v2 - if: matrix.name == "web-admin" + if: matrix.name == 'web-admin' with: credentials_json: "${{ secrets.RILL_BINARY_SA }}" - name: Set up GCloud SDK - if: matrix.name == "web-admin" + if: matrix.name == 'web-admin' uses: google-github-actions/setup-gcloud@v2 - name: gTest ${{ matrix.name }} - if: matrix.name == "web-admin" + if: matrix.name == 'web-admin' run: |- gsutil ls gs://rill-devtool/dotenv/ From f024e554aaa2ffea4dbfcd9a5efb6fad3fd7b24a Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 18:04:16 +0530 Subject: [PATCH 25/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 653a7a28e76..c9138ad09c1 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -78,6 +78,7 @@ jobs: if: matrix.name == 'web-admin' run: |- gsutil ls gs://rill-devtool/dotenv/ + gsutil cp gs://rill-devtool/dotenv/cloud-e2e.env . - name: Set up NodeJS uses: actions/setup-node@v4 From 0c15930d835916892c2af85480c51864e1610b69 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 19:32:05 +0530 Subject: [PATCH 26/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index c9138ad09c1..2defa04f27d 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -64,22 +64,6 @@ jobs: matrix: name: ${{ fromJson(needs.build.outputs.matrix) }} steps: - - name: Authenticate GCloud - uses: google-github-actions/auth@v2 - if: matrix.name == 'web-admin' - with: - credentials_json: "${{ secrets.RILL_BINARY_SA }}" - - - name: Set up GCloud SDK - if: matrix.name == 'web-admin' - uses: google-github-actions/setup-gcloud@v2 - - - name: gTest ${{ matrix.name }} - if: matrix.name == 'web-admin' - run: |- - gsutil ls gs://rill-devtool/dotenv/ - gsutil cp gs://rill-devtool/dotenv/cloud-e2e.env . - - name: Set up NodeJS uses: actions/setup-node@v4 with: @@ -118,8 +102,19 @@ jobs: - name: Install browser for UI tests run: npx playwright install + - name: Authenticate GCloud + uses: google-github-actions/auth@v2 + if: matrix.name == 'web-admin' + with: + credentials_json: "${{ secrets.RILL_BINARY_SA }}" + + - name: Set up GCloud SDK + if: matrix.name == 'web-admin' + uses: google-github-actions/setup-gcloud@v2 + - name: Test ${{ matrix.name }} run: |- + rill devtool start e2e --reset --except ui npm run build -w ${{ matrix.name }} npm run test -w ${{ matrix.name }} From ebfaacf13c0009c091b3775dd83d57bf6614998d Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 20:19:44 +0530 Subject: [PATCH 27/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 2defa04f27d..88bf0dc309f 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -61,6 +61,7 @@ jobs: runs-on: ubuntu-latest needs: build strategy: + fail-fast: false matrix: name: ${{ fromJson(needs.build.outputs.matrix) }} steps: From 0eec4dd732ff0ea5687d46cb566a432baf08c95f Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 19 Dec 2024 20:29:35 +0530 Subject: [PATCH 28/31] de bug --- .github/workflows/web-test-e2e.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 88bf0dc309f..8f42a10c30c 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -113,6 +113,11 @@ jobs: if: matrix.name == 'web-admin' uses: google-github-actions/setup-gcloud@v2 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + env: + GA: "${{ secrets.RILL_BINARY_SA }}" + - name: Test ${{ matrix.name }} run: |- rill devtool start e2e --reset --except ui From 5df64e00ae7f58c1d4d0b407aa1cb58107a8c2a8 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Fri, 20 Dec 2024 12:30:55 +0530 Subject: [PATCH 29/31] Update web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index 8f42a10c30c..e7d97641c42 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -113,14 +113,8 @@ jobs: if: matrix.name == 'web-admin' uses: google-github-actions/setup-gcloud@v2 - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - env: - GA: "${{ secrets.RILL_BINARY_SA }}" - - name: Test ${{ matrix.name }} run: |- - rill devtool start e2e --reset --except ui npm run build -w ${{ matrix.name }} npm run test -w ${{ matrix.name }} From f63fb070500ef086c8d8ecf654e8a4ba6f846202 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Fri, 27 Dec 2024 11:37:56 +0530 Subject: [PATCH 30/31] Update .github/workflows/web-test-e2e.yml --- .github/workflows/web-test-e2e.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index e7d97641c42..ac188f2a152 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -49,13 +49,9 @@ jobs: id: matrix run: | echo "matrix=$(jq -n '[ - "web-admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), - "web-local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") + "web-admin" | select(${{ steps.filter.outputs.admin }} == "true" or ${{ steps.filter.outputs.common }} == "true"), + "web-local" | select(${{ steps.filter.outputs.local }} == "true" or ${{ steps.filter.outputs.common }} == "true") ]' | jq -c)" >> "$GITHUB_OUTPUT" - env: - FILTER_ADMIN: ${{ steps.filter.outputs.admin }} - FILTER_COMMON: ${{ steps.filter.outputs.common }} - FILTER_LOCAL: ${{ steps.filter.outputs.local }} e2e: runs-on: ubuntu-latest From 5cc631db2ac1441d18e24c73a55a4b5a5fbe4d25 Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Fri, 27 Dec 2024 11:41:50 +0530 Subject: [PATCH 31/31] Revert "Update .github/workflows/web-test-e2e.yml" This reverts commit f63fb070500ef086c8d8ecf654e8a4ba6f846202. --- .github/workflows/web-test-e2e.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/web-test-e2e.yml b/.github/workflows/web-test-e2e.yml index ac188f2a152..e7d97641c42 100644 --- a/.github/workflows/web-test-e2e.yml +++ b/.github/workflows/web-test-e2e.yml @@ -49,9 +49,13 @@ jobs: id: matrix run: | echo "matrix=$(jq -n '[ - "web-admin" | select(${{ steps.filter.outputs.admin }} == "true" or ${{ steps.filter.outputs.common }} == "true"), - "web-local" | select(${{ steps.filter.outputs.local }} == "true" or ${{ steps.filter.outputs.common }} == "true") + "web-admin" | select(env.FILTER_ADMIN == "true" or env.FILTER_COMMON == "true"), + "web-local" | select(env.FILTER_LOCAL == "true" or env.FILTER_COMMON == "true") ]' | jq -c)" >> "$GITHUB_OUTPUT" + env: + FILTER_ADMIN: ${{ steps.filter.outputs.admin }} + FILTER_COMMON: ${{ steps.filter.outputs.common }} + FILTER_LOCAL: ${{ steps.filter.outputs.local }} e2e: runs-on: ubuntu-latest