diff --git a/.github/workflows/ci-merge-queue.yaml b/.github/workflows/ci-e2e-main.yaml similarity index 84% rename from .github/workflows/ci-merge-queue.yaml rename to .github/workflows/ci-e2e-main.yaml index 6a63f3273c..0ad1209f16 100644 --- a/.github/workflows/ci-merge-queue.yaml +++ b/.github/workflows/ci-e2e-main.yaml @@ -1,7 +1,8 @@ -name: CI Merge Queue +name: CI E2E Main on: - merge_group: + push: + branches: [main] pull_request: types: [labeled, synchronize, opened, reopened] @@ -16,7 +17,7 @@ concurrency: jobs: e2e-test: if: > - github.event_name == 'merge_group' || + github.event_name == 'push' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'run-merge-queue')) runs-on: ubuntu-latest-8-cores @@ -127,7 +128,7 @@ jobs: packages/twenty-e2e-testing/test-results/ retention-days: 7 - ci-merge-queue-status-check: + ci-e2e-main-status-check: if: always() && !cancelled() timeout-minutes: 5 runs-on: ubuntu-latest @@ -136,3 +137,19 @@ jobs: - name: Fail job if any needs failed if: contains(needs.*.result, 'failure') run: exit 1 + + notify-main-ci-failure: + if: always() && github.event_name == 'push' && contains(needs.*.result, 'failure') + timeout-minutes: 5 + runs-on: ubuntu-latest + needs: [e2e-test] + steps: + - name: Ping engineering on main CI failure + run: | + curl -fsS -X POST https://engineering.twenty.com/s/main-ci-failing \ + -H 'Content-Type: application/json' \ + -d '{ + "commit": "${{ github.sha }}", + "actor": "${{ github.actor }}", + "run_url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" + }' diff --git a/.github/workflows/ci-front-component-renderer.yaml b/.github/workflows/ci-front-component-renderer.yaml index d2535f4218..1dff161bdd 100644 --- a/.github/workflows/ci-front-component-renderer.yaml +++ b/.github/workflows/ci-front-component-renderer.yaml @@ -2,7 +2,6 @@ name: CI Front Component Renderer on: pull_request: - merge_group: permissions: contents: read @@ -13,7 +12,6 @@ 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-front.yaml b/.github/workflows/ci-front.yaml index ec913297d9..18b8da4f18 100644 --- a/.github/workflows/ci-front.yaml +++ b/.github/workflows/ci-front.yaml @@ -2,7 +2,6 @@ name: CI Front on: pull_request: - merge_group: push: branches: [main] diff --git a/.github/workflows/ci-new-ui.yaml b/.github/workflows/ci-new-ui.yaml index b2fabc846b..7dd94967da 100644 --- a/.github/workflows/ci-new-ui.yaml +++ b/.github/workflows/ci-new-ui.yaml @@ -2,7 +2,6 @@ name: CI New UI on: pull_request: - merge_group: push: branches: [main] diff --git a/.github/workflows/ci-sdk.yaml b/.github/workflows/ci-sdk.yaml index 938161b8c7..cbb48449d1 100644 --- a/.github/workflows/ci-sdk.yaml +++ b/.github/workflows/ci-sdk.yaml @@ -2,7 +2,6 @@ name: CI SDK on: pull_request: - merge_group: permissions: contents: read @@ -13,7 +12,6 @@ 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 cea801d2fa..449b1eb99f 100644 --- a/.github/workflows/ci-server.yaml +++ b/.github/workflows/ci-server.yaml @@ -2,7 +2,6 @@ name: CI Server on: pull_request: - merge_group: permissions: contents: read @@ -16,7 +15,6 @@ env: jobs: changed-files-check: - if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: | diff --git a/.github/workflows/ci-shared.yaml b/.github/workflows/ci-shared.yaml index e2af8d9eb8..4093b4123f 100644 --- a/.github/workflows/ci-shared.yaml +++ b/.github/workflows/ci-shared.yaml @@ -2,7 +2,6 @@ name: CI Shared on: pull_request: - merge_group: permissions: contents: read @@ -13,7 +12,6 @@ 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-test-docker-compose.yaml b/.github/workflows/ci-test-docker-compose.yaml index 28a6346049..ac9366b6a7 100644 --- a/.github/workflows/ci-test-docker-compose.yaml +++ b/.github/workflows/ci-test-docker-compose.yaml @@ -5,7 +5,6 @@ permissions: on: pull_request: - merge_group: concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -13,7 +12,6 @@ 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-website.yaml b/.github/workflows/ci-website.yaml index 51f14f224f..8159893507 100644 --- a/.github/workflows/ci-website.yaml +++ b/.github/workflows/ci-website.yaml @@ -2,7 +2,6 @@ name: CI Website on: pull_request: - merge_group: permissions: contents: read @@ -13,7 +12,6 @@ concurrency: jobs: changed-files-check: - if: github.event_name != 'merge_group' uses: ./.github/workflows/changed-files.yaml with: files: |