Skip to content

Commit 6ac3c31

Browse files
committed
Fix LLVM CI
1 parent 74ef093 commit 6ac3c31

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

.github/workflows/premerge.yaml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ concurrency:
2525

2626
jobs:
2727
premerge-checks-linux:
28-
if: >-
29-
false && github.repository_owner == 'llvm' &&
30-
(github.event_name != 'pull_request' || github.event.action != 'closed')
31-
runs-on: llvm-premerge-linux-runners
28+
if: (github.event_name != 'pull_request' || github.event.action != 'closed')
29+
runs-on: ubuntu-22.04
3230
steps:
3331
- name: Checkout LLVM
3432
uses: actions/checkout@v4
@@ -83,10 +81,8 @@ jobs:
8381
./.ci/monolithic-linux.sh "$(echo ${linux_projects} | tr ' ' ';')" "$(echo ${linux_check_targets})" "$(echo ${linux_runtimes} | tr ' ' ';')" "$(echo ${linux_runtime_check_targets})"
8482
8583
premerge-checks-windows:
86-
if: >-
87-
false && github.repository_owner == 'llvm' &&
88-
(github.event_name != 'pull_request' || github.event.action != 'closed')
89-
runs-on: llvm-premerge-windows-runners
84+
if: (github.event_name != 'pull_request' || github.event.action != 'closed')
85+
runs-on: windows-2022
9086
defaults:
9187
run:
9288
shell: bash
@@ -144,11 +140,7 @@ jobs:
144140
145141
permerge-check-macos:
146142
runs-on: macos-14
147-
if: >-
148-
github.repository_owner == 'llvm' &&
149-
(startswith(github.ref_name, 'release/') ||
150-
startswith(github.base_ref, 'release/')) &&
151-
(github.event_name != 'pull_request' || github.event.action != 'closed')
143+
if: (github.event_name != 'pull_request' || github.event.action != 'closed')
152144
steps:
153145
- name: Checkout LLVM
154146
uses: actions/checkout@v4

0 commit comments

Comments
 (0)