ci: configure merge queue for `main` (#3913)

- configure the rust/test workflows to support merge queues into `main`

---------

Signed-off-by: Paul Balaji <paul@hyperlane.xyz>
kunal/avs-validator-check-status
Paul Balaji 6 months ago committed by GitHub
parent ba946f1eff
commit 50d2f29324
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      .github/workflows/rust-skipped.yml
  2. 3
      .github/workflows/rust.yml
  3. 6
      .github/workflows/test.yml

@ -9,6 +9,8 @@ on:
paths-ignore: paths-ignore:
- 'rust/**' - 'rust/**'
- .github/workflows/rust.yml - .github/workflows/rust.yml
# Support for merge queues
merge_group:
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always

@ -6,7 +6,8 @@ on:
paths: paths:
- 'rust/**' - 'rust/**'
- .github/workflows/rust.yml - .github/workflows/rust.yml
# Support for merge queues
merge_group:
# Allows you to run this workflow manually from the Actions tab # Allows you to run this workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:

@ -7,6 +7,8 @@ on:
pull_request: pull_request:
branches: branches:
- '*' # run against all branches - '*' # run against all branches
# Support for merge queues
merge_group:
# Allows you to run this workflow manually from the Actions tab # Allows you to run this workflow manually from the Actions tab
workflow_dispatch: workflow_dispatch:
@ -224,7 +226,7 @@ jobs:
e2e-matrix: e2e-matrix:
runs-on: larger-runner runs-on: larger-runner
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main') if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main') || github.event_name == 'merge_group'
needs: [yarn-build, checkout-registry] needs: [yarn-build, checkout-registry]
strategy: strategy:
matrix: matrix:
@ -325,7 +327,7 @@ jobs:
cli-e2e: cli-e2e:
runs-on: larger-runner runs-on: larger-runner
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main') if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main') || github.event_name == 'merge_group'
needs: [yarn-build, checkout-registry] needs: [yarn-build, checkout-registry]
strategy: strategy:
matrix: matrix:

Loading…
Cancel
Save