Skip to content

Commit 8b6df44

Browse files
committed
maybe this
1 parent 6a3a395 commit 8b6df44

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Diff for: .github/workflows/ci.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,33 @@ jobs:
5353
values:
5454
- os: ubuntu-latest
5555
coverage: true
56+
skip: false
5657
- os: windows-latest
5758
coverage: true
58-
skip-if-merge-queue: true
59+
skip: ${{ github.event_name == 'merge_group' }}
5960
- os: macos-latest
6061
coverage: true
61-
skip-if-merge-queue: true
62+
skip: ${{ github.event_name == 'merge_group' }}
6263
- os: ubuntu-latest
6364
name: 'no submodules'
6465
no-submodules: true
65-
skip-if-merge-queue: true
66+
skip: ${{ github.event_name == 'merge_group' }}
6667
- os: ['self-hosted', '1ES.Pool=TypeScript-1ES-GitHub-XL', '1ES.ImageOverride=mariner-2.0']
6768
name: 'race mode'
6869
race: true
69-
skip-if-merge-queue: true
70+
skip: ${{ github.event_name == 'merge_group' }}
7071
- os: ubuntu-latest
7172
name: 'noembed'
7273
noembed: true
73-
skip-if-merge-queue: true
74+
skip: ${{ github.event_name == 'merge_group' }}
7475
- os: ubuntu-latest
7576
name: 'concurrent test programs'
7677
concurrent-test-programs: true
7778
coverage: true
79+
skip: ${{ github.event_name == 'merge_group' }}
7880
exclude:
7981
- values:
80-
skip-if-merge-queue: ${{ github.event_name == 'merge_group' }}
82+
skip: true
8183

8284
name: test (${{ matrix.values.name || matrix.values.os }})
8385

0 commit comments

Comments
 (0)