diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ci.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75824e3db..18e5fa7bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: branches: [master] concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.event_name != 'push' }} jobs: build: strategy: @@ -70,8 +70,10 @@ jobs: compiler: cl platform: x86_64 test-category: full - full-gpu-tests: true - runs-on: [Windows, self-hosted, GCP-T4] + # Run full gpu tests on PR/Main branch, but not on merge_group. + full-gpu-tests: ${{ github.event_name != 'merge_group' }} + # Run on self-hosted machine when using full-gpu-tests, otherwise on github runners. + runs-on: ["Windows", "self-hosted", "GCP-T4"] has-gpu: true server-count: 8 # Self-hosted full gpu build - debug @@ -80,8 +82,8 @@ jobs: compiler: cl platform: x86_64 test-category: full - full-gpu-tests: true - runs-on: [Windows, self-hosted, GCP-T4] + full-gpu-tests: ${{ github.event_name != 'merge_group' }} + runs-on: ["Windows", "self-hosted", "GCP-T4"] has-gpu: true server-count: 8 fail-fast: false |