Skip to content

Commit fb53989

Browse files
authored
Merge pull request #1200 from square/rick/pull-request-trigger
use a standard `pull_request` trigger for `kotlin.yml`
2 parents b0c14a4 + 72b1208 commit fb53989

File tree

1 file changed

+8
-45
lines changed

1 file changed

+8
-45
lines changed

.github/workflows/kotlin.yml

Lines changed: 8 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
name : Kotlin CI
22

33
on :
4-
# Use pull_request_target so we can lock the runner down to run only on the main branch.
5-
# When we want to test changes to this workflow, then we can use:
6-
# pull_request :
7-
# temporarily. We will also need to change the runner group permissions for the
8-
# workflow-kotlin-test-runner-ubuntu-4core group so that it can run with the branch/SHA
9-
# of the PR.
10-
pull_request_target :
11-
branches :
12-
- main
4+
pull_request :
135
merge_group :
146

157
env:
@@ -28,8 +20,6 @@ jobs :
2820
steps :
2921
- name: Checkout
3022
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
31-
with:
32-
ref: ${{ github.head_ref }}
3323

3424
- name : main build
3525
uses : ./.github/actions/gradle-task
@@ -44,8 +34,6 @@ jobs :
4434
steps :
4535
- name: Checkout
4636
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
47-
with:
48-
ref: ${{ github.head_ref }}
4937

5038
- name : Run dokka to validate kdoc
5139
uses : ./.github/actions/gradle-task
@@ -59,8 +47,6 @@ jobs :
5947
steps :
6048
- name: Checkout
6149
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
62-
with:
63-
ref: ${{ github.head_ref }}
6450

6551
- name : check published artifacts
6652
uses : ./.github/actions/gradle-task-with-commit
@@ -77,8 +63,6 @@ jobs :
7763
steps :
7864
- name: Checkout
7965
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
80-
with:
81-
ref: ${{ github.head_ref }}
8266

8367
- name : check published artifacts
8468
uses : ./.github/actions/gradle-task-with-commit
@@ -94,8 +78,6 @@ jobs :
9478
steps :
9579
- name: Checkout
9680
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
97-
with:
98-
ref: ${{ github.head_ref }}
9981

10082
# If the PR was made by a maintainer or Renovate, automatically update baselines and push
10183
# so that no one has to check out the branch and update the baselines manually.
@@ -113,8 +95,6 @@ jobs :
11395
steps :
11496
- name: Checkout
11597
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
116-
with:
117-
ref: ${{ github.head_ref }}
11898

11999
# If the PR was made by a maintainer or Renovate, automatically format and push
120100
# so that no one has to check out the branch and do it manually.
@@ -132,8 +112,6 @@ jobs :
132112
steps :
133113
- name: Checkout
134114
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
135-
with:
136-
ref: ${{ github.head_ref }}
137115

138116
# If the PR was made by a maintainer or Renovate, automatically format and push
139117
# so that no one has to check out the branch and do it manually.
@@ -153,8 +131,7 @@ jobs :
153131
steps :
154132
- name: Checkout
155133
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
156-
with:
157-
ref: ${{ github.head_ref }}
134+
158135
- name : Check with Gradle
159136
uses : ./.github/actions/gradle-task
160137
with :
@@ -169,8 +146,7 @@ jobs :
169146
steps :
170147
- name: Checkout
171148
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
172-
with:
173-
ref: ${{ github.head_ref }}
149+
174150
- name : Check with Gradle
175151
uses : ./.github/actions/gradle-task
176152
with :
@@ -196,8 +172,7 @@ jobs :
196172
# These setup steps should be common across all jobs in this workflow.
197173
- name: Checkout
198174
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
199-
with:
200-
ref: ${{ github.head_ref }}
175+
201176
- name : build tutorials
202177
uses : ./.github/actions/gradle-task
203178
with :
@@ -212,8 +187,7 @@ jobs :
212187
steps :
213188
- name: Checkout
214189
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
215-
with:
216-
ref: ${{ github.head_ref }}
190+
217191
- name : Check with Gradle
218192
uses : ./.github/actions/gradle-task
219193
with :
@@ -234,8 +208,7 @@ jobs :
234208
steps :
235209
- name: Checkout
236210
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
237-
with:
238-
ref: ${{ github.head_ref }}
211+
239212
- name : Check with Gradle
240213
uses : ./.github/actions/gradle-task
241214
with :
@@ -256,8 +229,7 @@ jobs :
256229
steps :
257230
- name: Checkout
258231
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
259-
with:
260-
ref: ${{ github.head_ref }}
232+
261233
- name : Check with Gradle
262234
uses : ./.github/actions/gradle-task
263235
with :
@@ -278,8 +250,7 @@ jobs :
278250
steps :
279251
- name: Checkout
280252
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
281-
with:
282-
ref: ${{ github.head_ref }}
253+
283254
- name : Check with Gradle
284255
uses : ./.github/actions/gradle-task
285256
with :
@@ -300,8 +271,6 @@ jobs :
300271
steps :
301272
- name: Checkout
302273
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
303-
with:
304-
ref: ${{ github.head_ref }}
305274

306275
## JS Specific Tests (for KMP js actuals in core and runtime).
307276
- name : Check with Gradle
@@ -330,8 +299,6 @@ jobs :
330299
steps :
331300
- name: Checkout
332301
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
333-
with:
334-
ref: ${{ github.head_ref }}
335302

336303
- name : Instrumented tests
337304
uses : ./.github/actions/gradle-tasks-with-emulator
@@ -357,8 +324,6 @@ jobs :
357324
steps :
358325
- name: Checkout
359326
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
360-
with:
361-
ref: ${{ github.head_ref }}
362327

363328
- name : Instrumented tests
364329
uses : ./.github/actions/gradle-tasks-with-emulator
@@ -386,8 +351,6 @@ jobs :
386351
steps :
387352
- name: Checkout
388353
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
389-
with:
390-
ref: ${{ github.head_ref }}
391354

392355
- name : Instrumented tests
393356
uses : ./.github/actions/gradle-tasks-with-emulator

0 commit comments

Comments
 (0)