diff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yaml index 2de139148e..abe92642f3 100644 --- a/.github/workflows/ci-front.yaml +++ b/.github/workflows/ci-front.yaml @@ -2,6 +2,7 @@ name: CI Front on: pull_request: + merge_group: push: branches: [main] diff --git a/.github/workflows/ci-sdk.yaml b/.github/workflows/ci-sdk.yaml index cbb48449d1..938161b8c7 100644 --- a/.github/workflows/ci-sdk.yaml +++ b/.github/workflows/ci-sdk.yaml @@ -2,6 +2,7 @@ name: CI SDK on: pull_request: + merge_group: permissions: contents: read @@ -12,6 +13,7 @@ concurrency: jobs: changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: | diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml index 5332c5d8e4..388a67301d 100644 --- a/.github/workflows/ci-server.yaml +++ b/.github/workflows/ci-server.yaml @@ -2,6 +2,7 @@ name: CI Server on: pull_request: + merge_group: permissions: contents: read @@ -15,6 +16,7 @@ env: jobs: changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: | @@ -29,6 +31,7 @@ jobs: packages/twenty-shared/** upgrade-changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: | @@ -90,6 +93,7 @@ jobs: tasks: lingui:compile server-previous-version-upgrade-mutation-guard: + if: github.event_name != 'merge_group' timeout-minutes: 5 runs-on: ubuntu-latest steps: diff --git a/.github/workflows/ci-test-docker-compose.yaml b/.github/workflows/ci-test-docker-compose.yaml index ac9366b6a7..28a6346049 100644 --- a/.github/workflows/ci-test-docker-compose.yaml +++ b/.github/workflows/ci-test-docker-compose.yaml @@ -5,6 +5,7 @@ permissions: on: pull_request: + merge_group: concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -12,6 +13,7 @@ concurrency: jobs: changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: | diff --git a/.github/workflows/ci-twenty-apps.yaml b/.github/workflows/ci-twenty-apps.yaml index c59efbbd1b..a50c115553 100644 --- a/.github/workflows/ci-twenty-apps.yaml +++ b/.github/workflows/ci-twenty-apps.yaml @@ -5,6 +5,7 @@ on: branches: - main pull_request: + merge_group: workflow_dispatch: inputs: application: @@ -22,6 +23,7 @@ concurrency: jobs: discover: + if: github.event_name != 'merge_group' uses: ./.github/workflows/discover-apps.yaml with: scope: internal-and-public diff --git a/.github/workflows/ci-website.yaml b/.github/workflows/ci-website.yaml index 8159893507..51f14f224f 100644 --- a/.github/workflows/ci-website.yaml +++ b/.github/workflows/ci-website.yaml @@ -2,6 +2,7 @@ name: CI Website on: pull_request: + merge_group: permissions: contents: read @@ -12,6 +13,7 @@ concurrency: jobs: changed-files-check: + if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: |