Skip to content

Commit ba44f5e

Browse files
authored
Merge pull request #692 from integer32llc/ci-for-untrusted-repos
Still run CI for master branch pushes
2 parents 7c697db + a580582 commit ba44f5e

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- stable
2525
- beta
2626
- nightly
27-
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
27+
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
2828
env:
2929
IMAGE_NAME: ghcr.io/integer32llc/rust-playground-ci-rust-${{ matrix.channel }}
3030
steps:
@@ -129,7 +129,7 @@ jobs:
129129
- clippy
130130
- miri
131131
- rustfmt
132-
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
132+
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
133133
env:
134134
IMAGE_NAME: ghcr.io/integer32llc/rust-playground-ci-tool-${{ matrix.tool }}
135135
steps:
@@ -163,7 +163,7 @@ jobs:
163163
build_backend:
164164
name: Build backend
165165
runs-on: ubuntu-latest
166-
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
166+
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
167167
steps:
168168
- name: Checkout code
169169
uses: actions/checkout@v2
@@ -193,7 +193,7 @@ jobs:
193193
build_frontend:
194194
name: Build frontend
195195
runs-on: ubuntu-latest
196-
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
196+
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
197197
steps:
198198
- name: Checkout code
199199
uses: actions/checkout@v2
@@ -228,7 +228,7 @@ jobs:
228228
run_integration_tests:
229229
name: Running integration tests
230230
runs-on: ubuntu-latest
231-
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
231+
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
232232
needs:
233233
- build_compiler_containers
234234
- build_tool_containers

ci/workflows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ workflows:
230230
jobs:
231231
build_compiler_containers:
232232
<<: *build_compiler_containers_job
233-
if: "contains(github.event.pull_request.labels.*.name, 'CI: approved')"
233+
if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI: approved')"
234234
env:
235235
<<: *build_compiler_containers_job_env
236236

@@ -246,7 +246,7 @@ workflows:
246246

247247
build_tool_containers:
248248
<<: *build_tool_containers_job
249-
if: "contains(github.event.pull_request.labels.*.name, 'CI: approved')"
249+
if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI: approved')"
250250
env:
251251
<<: *build_tool_containers_job_env
252252

@@ -259,7 +259,7 @@ workflows:
259259
build_backend:
260260
name: "Build backend"
261261
runs-on: ubuntu-latest
262-
if: "contains(github.event.pull_request.labels.*.name, 'CI: approved')"
262+
if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI: approved')"
263263

264264
steps:
265265
- *checkout_pr
@@ -302,7 +302,7 @@ workflows:
302302
build_frontend:
303303
name: "Build frontend"
304304
runs-on: ubuntu-latest
305-
if: "contains(github.event.pull_request.labels.*.name, 'CI: approved')"
305+
if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI: approved')"
306306

307307
steps:
308308
- *checkout_pr
@@ -349,7 +349,7 @@ workflows:
349349
run_integration_tests:
350350
name: "Running integration tests"
351351
runs-on: ubuntu-latest
352-
if: "contains(github.event.pull_request.labels.*.name, 'CI: approved')"
352+
if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI: approved')"
353353
needs:
354354
- build_compiler_containers
355355
- build_tool_containers

0 commit comments

Comments
 (0)