Skip to content

Still run CI for master branch pushes #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2021
Merged

Still run CI for master branch pushes #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- stable
- beta
- nightly
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
env:
IMAGE_NAME: ghcr.io/integer32llc/rust-playground-ci-rust-${{ matrix.channel }}
steps:
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- clippy
- miri
- rustfmt
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
env:
IMAGE_NAME: ghcr.io/integer32llc/rust-playground-ci-tool-${{ matrix.tool }}
steps:
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
build_backend:
name: Build backend
runs-on: ubuntu-latest
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
build_frontend:
name: Build frontend
runs-on: ubuntu-latest
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
run_integration_tests:
name: Running integration tests
runs-on: ubuntu-latest
if: 'contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
if: 'github.event_name == ''push'' || contains(github.event.pull_request.labels.*.name, ''CI: approved'')'
needs:
- build_compiler_containers
- build_tool_containers
Expand Down
10 changes: 5 additions & 5 deletions ci/workflows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ workflows:
jobs:
build_compiler_containers:
<<: *build_compiler_containers_job
if: "contains(github.event.pull_request.labels.*.name, 'CI: approved')"
if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI: approved')"
env:
<<: *build_compiler_containers_job_env

Expand All @@ -246,7 +246,7 @@ workflows:

build_tool_containers:
<<: *build_tool_containers_job
if: "contains(github.event.pull_request.labels.*.name, 'CI: approved')"
if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI: approved')"
env:
<<: *build_tool_containers_job_env

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

steps:
- *checkout_pr
Expand Down Expand Up @@ -302,7 +302,7 @@ workflows:
build_frontend:
name: "Build frontend"
runs-on: ubuntu-latest
if: "contains(github.event.pull_request.labels.*.name, 'CI: approved')"
if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI: approved')"

steps:
- *checkout_pr
Expand Down Expand Up @@ -349,7 +349,7 @@ workflows:
run_integration_tests:
name: "Running integration tests"
runs-on: ubuntu-latest
if: "contains(github.event.pull_request.labels.*.name, 'CI: approved')"
if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'CI: approved')"
needs:
- build_compiler_containers
- build_tool_containers
Expand Down