From 778a6cc3a37894e3bfa75a4568be773c9a1f2137 Mon Sep 17 00:00:00 2001 From: riya-n Date: Wed, 3 Jan 2024 00:22:04 -0800 Subject: [PATCH 1/6] init --- .github/workflows/trunk-hourly-e2e-tests.yml | 61 +++++++++++++++----- .github/workflows/trunk-hourly-tests.yml | 12 ++-- 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/.github/workflows/trunk-hourly-e2e-tests.yml b/.github/workflows/trunk-hourly-e2e-tests.yml index 5fbea08903efd..aa281f39b63e4 100644 --- a/.github/workflows/trunk-hourly-e2e-tests.yml +++ b/.github/workflows/trunk-hourly-e2e-tests.yml @@ -2,7 +2,7 @@ name: Upload E2E Test Results to Trunk (Hourly) on: schedule: - - cron: '*/10 * * * *' + - cron: "*/10 * * * *" workflow_dispatch: {} concurrency: @@ -10,7 +10,6 @@ concurrency: cancel-in-progress: true jobs: - e2e-matrix-builder: runs-on: ubuntu-22.04 timeout-minutes: 5 @@ -126,9 +125,14 @@ jobs: - run: ls -l ./cypress/reports/mochareports/ - name: Upload results - run: ./.trunk-ci-analytics/bin --token=${{ secrets.TRUNK_DEBUGGER_TOKEN }} --input="cypress/reports/**/*junit*.xml" + uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + with: + junit_paths: cypress/reports/**/*junit*.xml + org_url_slug: trunk-staging-org + token: ${{ secrets.TRUNK_API_TOKEN }} + repo_url: ${{ github.repositoryUrl }} + dry_run: false env: - REPO_URL: ${{ github.repositoryUrl }} RUST_LOG: info continue-on-error: true @@ -142,9 +146,14 @@ jobs: - run: ls -l ./cypress/reports/mochareports/ - name: Upload results - run: ./.trunk-ci-analytics/bin --token=${{ secrets.TRUNK_DEBUGGER_TOKEN }} --input="cypress/reports/**/*junit*.xml" + uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + with: + junit_paths: cypress/reports/**/*junit*.xml + org_url_slug: trunk-staging-org + token: ${{ secrets.TRUNK_API_TOKEN }} + repo_url: ${{ github.repositoryUrl }} + dry_run: false env: - REPO_URL: ${{ github.repositoryUrl }} RUST_LOG: info continue-on-error: true @@ -158,9 +167,14 @@ jobs: - run: ls -l ./cypress/reports/mochareports/ - name: Upload results - run: ./.trunk-ci-analytics/bin --token=${{ secrets.TRUNK_DEBUGGER_TOKEN }} --input="cypress/reports/**/*junit*.xml" + uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + with: + junit_paths: cypress/reports/**/*junit*.xml + org_url_slug: trunk-staging-org + token: ${{ secrets.TRUNK_API_TOKEN }} + repo_url: ${{ github.repositoryUrl }} + dry_run: false env: - REPO_URL: ${{ github.repositoryUrl }} RUST_LOG: info continue-on-error: true @@ -175,9 +189,14 @@ jobs: - run: ls -l ./cypress/reports/mochareports/ - name: Upload results - run: ./.trunk-ci-analytics/bin --token=${{ secrets.TRUNK_DEBUGGER_TOKEN }} --input="cypress/reports/**/*junit*.xml" + uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + with: + junit_paths: cypress/reports/**/*junit*.xml + org_url_slug: trunk-staging-org + token: ${{ secrets.TRUNK_API_TOKEN }} + repo_url: ${{ github.repositoryUrl }} + dry_run: false env: - REPO_URL: ${{ github.repositoryUrl }} RUST_LOG: info continue-on-error: true @@ -193,16 +212,26 @@ jobs: continue-on-error: true - name: Upload results - run: ./.trunk-ci-analytics/bin --token=${{ secrets.TRUNK_DEBUGGER_TOKEN }} --input="cypress/reports/**/*junit*.xml" + uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + with: + junit_paths: cypress/reports/**/*junit*.xml + org_url_slug: trunk-staging-org + token: ${{ secrets.TRUNK_API_TOKEN }} + repo_url: ${{ github.repositoryUrl }} + dry_run: false env: - REPO_URL: ${{ github.repositoryUrl }} RUST_LOG: info continue-on-error: true - name: Upload results - run: ./.trunk-ci-analytics/trunk-metrics-cli upload --custom-tags="tests=e2e" --token=${{ secrets.TRUNK_DEBUGGER_TOKEN }} --org=trunk-staging-org --junit-paths="cypress/reports/**/*junit*.xml" + uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + with: + junit_paths: cypress/reports/**/*junit*.xml + org_url_slug: trunk-staging-org + token: ${{ secrets.TRUNK_API_TOKEN }} + repo_url: ${{ github.repositoryUrl }} + tags: tests=e2e + dry_run: false env: - REPO_URL: ${{ github.repositoryUrl }} TRUNK_LOG: debug - - continue-on-error: true \ No newline at end of file + continue-on-error: true diff --git a/.github/workflows/trunk-hourly-tests.yml b/.github/workflows/trunk-hourly-tests.yml index c4a19a3ccec9c..8b07878783ee6 100644 --- a/.github/workflows/trunk-hourly-tests.yml +++ b/.github/workflows/trunk-hourly-tests.yml @@ -2,7 +2,7 @@ name: Upload Test Results to Trunk (Hourly) on: schedule: - - cron: '0 1 * * *' + - cron: "0 1 * * *" workflow_dispatch: {} concurrency: @@ -13,7 +13,6 @@ env: CLJ_KONDO_VERSION: "2023.09.07" jobs: - be-tests: runs-on: ubuntu-22.04 name: be-tests-java-${{ matrix.java-version }}-${{ matrix.edition }} @@ -47,8 +46,13 @@ jobs: continue-on-error: true - name: Upload results - run: ./.trunk-ci-analytics/bin --token=${{ secrets.TRUNK_DEBUGGER_TOKEN }} --input="target/junit/**/*_test.xml" + uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + with: + junit_paths: target/junit/**/*_test.xml + org_url_slug: trunk-staging-org + token: ${{ secrets.TRUNK_API_TOKEN }} # TRUNK_DEBUGGER_TOKEN? + repo_url: ${{ github.repositoryUrl }} + dry_run: false env: - REPO_URL: ${{ github.repositoryUrl }} RUST_LOG: info continue-on-error: true From 29087241b1b7265eb9cf28addf8b3c69fb914983 Mon Sep 17 00:00:00 2001 From: riya-n Date: Wed, 3 Jan 2024 00:34:05 -0800 Subject: [PATCH 2/6] fix --- .github/workflows/trunk-sync-fork.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/trunk-sync-fork.yml b/.github/workflows/trunk-sync-fork.yml index 4571713149149..0e9e5ca427ec0 100644 --- a/.github/workflows/trunk-sync-fork.yml +++ b/.github/workflows/trunk-sync-fork.yml @@ -3,7 +3,7 @@ name: Trunk Sync Fork on: schedule: # Run every 10 minutes. - - cron: '*/10 * * * *' + - cron: "*/10 * * * *" workflow_dispatch: jobs: @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-22.04 steps: - - name: Run Fork Sync - uses: tgymnich/fork-sync@v1.8 - with: - owner: metabase - base: master - head: master \ No newline at end of file + - name: Run Fork Sync + uses: tgymnich/fork-sync@v1.8 + with: + owner: metabase + base: master + head: master From 31b246e169b86307175841700037da15281ac8ea Mon Sep 17 00:00:00 2001 From: riya-n Date: Wed, 3 Jan 2024 01:24:06 -0800 Subject: [PATCH 3/6] remove dryrun --- .github/workflows/trunk-hourly-e2e-tests.yml | 6 ------ .github/workflows/trunk-hourly-tests.yml | 1 - 2 files changed, 7 deletions(-) diff --git a/.github/workflows/trunk-hourly-e2e-tests.yml b/.github/workflows/trunk-hourly-e2e-tests.yml index aa281f39b63e4..491b80291c9cb 100644 --- a/.github/workflows/trunk-hourly-e2e-tests.yml +++ b/.github/workflows/trunk-hourly-e2e-tests.yml @@ -131,7 +131,6 @@ jobs: org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_API_TOKEN }} repo_url: ${{ github.repositoryUrl }} - dry_run: false env: RUST_LOG: info continue-on-error: true @@ -152,7 +151,6 @@ jobs: org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_API_TOKEN }} repo_url: ${{ github.repositoryUrl }} - dry_run: false env: RUST_LOG: info continue-on-error: true @@ -173,7 +171,6 @@ jobs: org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_API_TOKEN }} repo_url: ${{ github.repositoryUrl }} - dry_run: false env: RUST_LOG: info continue-on-error: true @@ -195,7 +192,6 @@ jobs: org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_API_TOKEN }} repo_url: ${{ github.repositoryUrl }} - dry_run: false env: RUST_LOG: info continue-on-error: true @@ -218,7 +214,6 @@ jobs: org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_API_TOKEN }} repo_url: ${{ github.repositoryUrl }} - dry_run: false env: RUST_LOG: info continue-on-error: true @@ -231,7 +226,6 @@ jobs: token: ${{ secrets.TRUNK_API_TOKEN }} repo_url: ${{ github.repositoryUrl }} tags: tests=e2e - dry_run: false env: TRUNK_LOG: debug continue-on-error: true diff --git a/.github/workflows/trunk-hourly-tests.yml b/.github/workflows/trunk-hourly-tests.yml index 8b07878783ee6..aa74428bd4d9c 100644 --- a/.github/workflows/trunk-hourly-tests.yml +++ b/.github/workflows/trunk-hourly-tests.yml @@ -52,7 +52,6 @@ jobs: org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_API_TOKEN }} # TRUNK_DEBUGGER_TOKEN? repo_url: ${{ github.repositoryUrl }} - dry_run: false env: RUST_LOG: info continue-on-error: true From 7ab02a21404b53c576091627fddd68f62df11be5 Mon Sep 17 00:00:00 2001 From: riya-n Date: Wed, 3 Jan 2024 03:39:37 -0800 Subject: [PATCH 4/6] add release version --- .github/workflows/trunk-hourly-e2e-tests.yml | 12 ++++++------ .github/workflows/trunk-hourly-tests.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/trunk-hourly-e2e-tests.yml b/.github/workflows/trunk-hourly-e2e-tests.yml index 491b80291c9cb..e6588c690b729 100644 --- a/.github/workflows/trunk-hourly-e2e-tests.yml +++ b/.github/workflows/trunk-hourly-e2e-tests.yml @@ -125,7 +125,7 @@ jobs: - run: ls -l ./cypress/reports/mochareports/ - name: Upload results - uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + uses: trunk-io/trunk-analytics-uploader@v0.1.0 with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org @@ -145,7 +145,7 @@ jobs: - run: ls -l ./cypress/reports/mochareports/ - name: Upload results - uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + uses: trunk-io/trunk-analytics-uploader@v0.1.0 with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org @@ -165,7 +165,7 @@ jobs: - run: ls -l ./cypress/reports/mochareports/ - name: Upload results - uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + uses: trunk-io/trunk-analytics-uploader@v0.1.0 with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org @@ -186,7 +186,7 @@ jobs: - run: ls -l ./cypress/reports/mochareports/ - name: Upload results - uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + uses: trunk-io/trunk-analytics-uploader@v0.1.0 with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org @@ -208,7 +208,7 @@ jobs: continue-on-error: true - name: Upload results - uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + uses: trunk-io/trunk-analytics-uploader@v0.1.0 with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org @@ -219,7 +219,7 @@ jobs: continue-on-error: true - name: Upload results - uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + uses: trunk-io/trunk-analytics-uploader@v0.1.0 with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org diff --git a/.github/workflows/trunk-hourly-tests.yml b/.github/workflows/trunk-hourly-tests.yml index aa74428bd4d9c..9be97f1bb780e 100644 --- a/.github/workflows/trunk-hourly-tests.yml +++ b/.github/workflows/trunk-hourly-tests.yml @@ -46,11 +46,11 @@ jobs: continue-on-error: true - name: Upload results - uses: trunk-io/trunk-analytics-uploader@main # TODO: create v1 release tag + uses: trunk-io/trunk-analytics-uploader@v0.1.0 with: junit_paths: target/junit/**/*_test.xml org_url_slug: trunk-staging-org - token: ${{ secrets.TRUNK_API_TOKEN }} # TRUNK_DEBUGGER_TOKEN? + token: ${{ secrets.TRUNK_API_TOKEN }} repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info From 5f488b7339d8f7ba826631672b40879bcc2248e3 Mon Sep 17 00:00:00 2001 From: riya-n Date: Wed, 3 Jan 2024 09:41:54 -0800 Subject: [PATCH 5/6] rename debugger token --- .github/workflows/trunk-hourly-e2e-tests.yml | 12 ++++++------ .github/workflows/trunk-hourly-tests.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/trunk-hourly-e2e-tests.yml b/.github/workflows/trunk-hourly-e2e-tests.yml index e6588c690b729..fbabc84f41b94 100644 --- a/.github/workflows/trunk-hourly-e2e-tests.yml +++ b/.github/workflows/trunk-hourly-e2e-tests.yml @@ -129,7 +129,7 @@ jobs: with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org - token: ${{ secrets.TRUNK_API_TOKEN }} + token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info @@ -149,7 +149,7 @@ jobs: with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org - token: ${{ secrets.TRUNK_API_TOKEN }} + token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info @@ -169,7 +169,7 @@ jobs: with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org - token: ${{ secrets.TRUNK_API_TOKEN }} + token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info @@ -190,7 +190,7 @@ jobs: with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org - token: ${{ secrets.TRUNK_API_TOKEN }} + token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info @@ -212,7 +212,7 @@ jobs: with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org - token: ${{ secrets.TRUNK_API_TOKEN }} + token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info @@ -223,7 +223,7 @@ jobs: with: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org - token: ${{ secrets.TRUNK_API_TOKEN }} + token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} repo_url: ${{ github.repositoryUrl }} tags: tests=e2e env: diff --git a/.github/workflows/trunk-hourly-tests.yml b/.github/workflows/trunk-hourly-tests.yml index 9be97f1bb780e..0ee66aff45b76 100644 --- a/.github/workflows/trunk-hourly-tests.yml +++ b/.github/workflows/trunk-hourly-tests.yml @@ -50,7 +50,7 @@ jobs: with: junit_paths: target/junit/**/*_test.xml org_url_slug: trunk-staging-org - token: ${{ secrets.TRUNK_API_TOKEN }} + token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info From 7c49546a76789269c7476eda264ad483cfa97e32 Mon Sep 17 00:00:00 2001 From: riya-n Date: Wed, 3 Jan 2024 09:59:24 -0800 Subject: [PATCH 6/6] remove repo_url --- .github/workflows/trunk-hourly-e2e-tests.yml | 6 ------ .github/workflows/trunk-hourly-tests.yml | 1 - 2 files changed, 7 deletions(-) diff --git a/.github/workflows/trunk-hourly-e2e-tests.yml b/.github/workflows/trunk-hourly-e2e-tests.yml index fbabc84f41b94..ab0b494dbdfc0 100644 --- a/.github/workflows/trunk-hourly-e2e-tests.yml +++ b/.github/workflows/trunk-hourly-e2e-tests.yml @@ -130,7 +130,6 @@ jobs: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} - repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info continue-on-error: true @@ -150,7 +149,6 @@ jobs: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} - repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info continue-on-error: true @@ -170,7 +168,6 @@ jobs: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} - repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info continue-on-error: true @@ -191,7 +188,6 @@ jobs: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} - repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info continue-on-error: true @@ -213,7 +209,6 @@ jobs: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} - repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info continue-on-error: true @@ -224,7 +219,6 @@ jobs: junit_paths: cypress/reports/**/*junit*.xml org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} - repo_url: ${{ github.repositoryUrl }} tags: tests=e2e env: TRUNK_LOG: debug diff --git a/.github/workflows/trunk-hourly-tests.yml b/.github/workflows/trunk-hourly-tests.yml index 0ee66aff45b76..882b57954f838 100644 --- a/.github/workflows/trunk-hourly-tests.yml +++ b/.github/workflows/trunk-hourly-tests.yml @@ -51,7 +51,6 @@ jobs: junit_paths: target/junit/**/*_test.xml org_url_slug: trunk-staging-org token: ${{ secrets.TRUNK_DEBUGGER_TOKEN }} - repo_url: ${{ github.repositoryUrl }} env: RUST_LOG: info continue-on-error: true