Skip to content

Commit

Permalink
Fix master not running Simple CI (#5368)
Browse files Browse the repository at this point in the history
Co-authored-by: oneflow-ci-bot <69100618+oneflow-ci-bot@users.noreply.github.com>
  • Loading branch information
jackalcooper and oneflow-ci-bot committed Jul 2, 2021
1 parent 52ecdb9 commit c454f1a
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/simple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
jobs:
cancel_previous:
name: Cancel previous runs
if: github.event.pull_request.draft == false && github.base_ref == 'master' && contains(github.event.pull_request.requested_reviewers.*.login, 'oneflow-ci-bot')
runs-on: ubuntu-latest
steps:
- name: Cancel previous runs of outdated commit
Expand All @@ -25,7 +24,7 @@ jobs:
access_token: ${{ github.token }}
hosted:
name: CPU-only
if: github.event.pull_request.draft == false && github.base_ref == 'master' && contains(github.event.pull_request.requested_reviewers.*.login, 'oneflow-ci-bot')
if: github.ref == 'refs/heads/master' || (github.event.pull_request.draft == false && contains(github.event.pull_request.requested_reviewers.*.login, 'oneflow-ci-bot'))
runs-on: ${{ matrix.os }}
needs: [cancel_previous]
strategy:
Expand Down Expand Up @@ -131,7 +130,7 @@ jobs:
shell: bash
- name: Build (ALL)
if: always()
continue-on-error: ${{ matrix.cmake_generator == 'Ninja' && matrix.build_shared_libs == 'ON' }}
continue-on-error: ${{ startsWith(runner.os, 'macOS') && matrix.cmake_generator == 'Ninja' && matrix.build_shared_libs == 'ON' }}
run: |
mkdir -p build
cd build
Expand Down

0 comments on commit c454f1a

Please sign in to comment.