Skip to content

Commit

Permalink
Auto merge of rust-lang#5162 - flip1995:gha_fix, r=flip1995
Browse files Browse the repository at this point in the history
Fix GHA after the merge

changelog: none
  • Loading branch information
bors committed Feb 12, 2020
2 parents 71a5379 + b0d25de commit 2432a16
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ name: Clippy Test
on:
push:
# Ignore bors branches, since they are covered by `clippy_bors.yml`
branches-ignore: [auto, try]
branches-ignore:
- auto
- try
# Don't run Clippy tests, when only textfiles were modified
paths-ignore:
- 'COPYRIGHT'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/clippy_bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Clippy Test (bors)

on:
push:
branches: [auto, try]
branches:
- auto
- try

env:
RUST_BACKTRACE: 1
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/clippy_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Clippy Dev Test

on:
push:
branches: [auto, try]
branches:
- auto
- try
pull_request:
# Only run on paths, that get checked by the clippy_dev tool
paths:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: Deploy

on:
push:
branches: master
branches:
- master
release:
types: [created]
types:
- created

env:
TARGET_BRANCH: 'gh-pages'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/remark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Remark

on:
push:
branches: [auto, try]
branches:
- auto
- try
pull_request:
paths:
- '**.md'
Expand Down

0 comments on commit 2432a16

Please sign in to comment.