diff --git a/.github/workflows/install-ci.yml b/.github/workflows/install-ci.yml index 3364d08a3d..dfffcb756e 100644 --- a/.github/workflows/install-ci.yml +++ b/.github/workflows/install-ci.yml @@ -8,6 +8,7 @@ on: schedule: - cron: '0 6 * * *' # 6 AM UTC daily workflow_dispatch: # Allows manual triggering from GitHub UI + merge_group: jobs: test-pip: @@ -44,9 +45,9 @@ jobs: strategy: fail-fast: false matrix: - # For push/PR: only ubuntu. For schedule/manual: full matrix - os: ${{ (github.event_name == 'push' || github.event_name == 'pull_request') && fromJSON('["ubuntu-latest"]') || fromJSON('["ubuntu-latest","macos-latest"]') }} - python-version: ${{ github.event_name == 'pull_request' && fromJSON('["3.12"]') || fromJSON('["3.11","3.12","3.13"]') }} + # For push/PR/merge_group: only ubuntu. For schedule/manual: full matrix + os: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'merge_group') && fromJSON('["ubuntu-latest"]') || fromJSON('["ubuntu-latest","macos-latest"]') }} + python-version: ${{ (github.event_name == 'pull_request' || github.event_name == 'merge_group') && fromJSON('["3.12"]') || fromJSON('["3.11","3.12","3.13"]') }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index c6ca927497..364fe3ab60 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -19,6 +19,7 @@ name: Pre-commit on: pull_request: branches: [main, v2.0-refactor] + merge_group: jobs: pre-commit: @@ -38,4 +39,4 @@ jobs: python -m pip install --upgrade pip pip install -e . --group dev - - uses: pre-commit/action@v3.0.1 \ No newline at end of file + - uses: pre-commit/action@v3.0.1