From 30102b1474459601207060b4a258fafd43f188d4 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Wed, 20 Aug 2025 21:28:27 +0100 Subject: [PATCH] Revert "Dispatch github ci jobs after running update-vrt workflow (#5586)" (#5590) This reverts commit 3a8eb96d76ac4449f8afb2b9f05b74dfa0fccc70. --- .github/workflows/build.yml | 12 +----------- .github/workflows/check.yml | 14 +------------- .github/workflows/codeql.yml | 6 +----- .github/workflows/update-vrt.yml | 11 ----------- upcoming-release-notes/5586.md | 7 ------- 5 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 upcoming-release-notes/5586.md diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a71995753..955580ac7a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,11 +12,9 @@ on: branches: - master pull_request: - repository_dispatch: - types: [vrt_updated] concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.client_payload.pr_number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} jobs: @@ -24,8 +22,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - name: Set up environment uses: ./.github/actions/setup - name: Build API @@ -42,8 +38,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - name: Set up environment uses: ./.github/actions/setup - name: Build CRDT @@ -60,8 +54,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - name: Set up environment uses: ./.github/actions/setup - name: Build Web @@ -81,8 +73,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - name: Set up environment uses: ./.github/actions/setup - name: Build Server diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index dd5c76a088..c7ebd00a7e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,11 +5,9 @@ on: branches: - master pull_request: - repository_dispatch: - types: [vrt_updated] concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.client_payload.pr_number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} jobs: @@ -17,8 +15,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - name: Set up environment uses: ./.github/actions/setup - name: Lint @@ -27,8 +23,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - name: Set up environment uses: ./.github/actions/setup - name: Typecheck @@ -37,8 +31,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - name: Set up environment uses: ./.github/actions/setup - name: Build Web @@ -49,8 +41,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - name: Set up environment uses: ./.github/actions/setup - name: Test @@ -61,8 +51,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a031eb726a..20780a5625 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -4,13 +4,11 @@ on: push: branches: [master] pull_request: - repository_dispatch: - types: [vrt_updated] schedule: - cron: '23 11 * * 6' concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.client_payload.pr_number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} jobs: @@ -25,8 +23,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - with: - ref: ${{ github.event.client_payload.branch || github.ref }} - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/update-vrt.yml b/.github/workflows/update-vrt.yml index 5304592fb2..ccb19f6375 100644 --- a/.github/workflows/update-vrt.yml +++ b/.github/workflows/update-vrt.yml @@ -96,17 +96,6 @@ jobs: fi git commit -m "Update VRT" git push origin HEAD:${BRANCH_NAME} - - name: Trigger CI workflows - uses: peter-evans/repository-dispatch@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - event-type: vrt_updated - client-payload: | - { - "pr_number": "${{ github.event.issue.number }}", - "branch": "${{ steps.comment-branch.outputs.head_ref }}", - "sha": "${{ steps.comment-branch.outputs.head_sha }}" - } - name: Add finished reaction uses: dkershner6/reaction-action@v2 with: diff --git a/upcoming-release-notes/5586.md b/upcoming-release-notes/5586.md deleted file mode 100644 index 17d0f0d5e5..0000000000 --- a/upcoming-release-notes/5586.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -category: Enhancements -authors: [MatissJanis] ---- - -Add repository dispatch trigger to CI workflows for improved downstream job execution. -