diff --git a/.github/workflows/rust-skipped.yml b/.github/workflows/rust-skipped.yml index b6e6c51cd..2d9fe8a5d 100644 --- a/.github/workflows/rust-skipped.yml +++ b/.github/workflows/rust-skipped.yml @@ -9,6 +9,8 @@ on: paths-ignore: - 'rust/**' - .github/workflows/rust.yml + # Support for merge queues + merge_group: env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 48caa1f77..a6e270a48 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -6,7 +6,8 @@ on: paths: - 'rust/**' - .github/workflows/rust.yml - + # Support for merge queues + merge_group: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6bb18d5f..960b5b770 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,6 +7,8 @@ on: pull_request: branches: - '*' # run against all branches + # Support for merge queues + merge_group: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -224,7 +226,7 @@ jobs: e2e-matrix: 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] strategy: matrix: @@ -325,7 +327,7 @@ jobs: cli-e2e: 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] strategy: matrix: