diff options
| author | bors <bors@rust-lang.org> | 2020-02-12 10:24:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-12 10:24:27 +0000 |
| commit | 2432a16973bf50665f75cb3e56cab1611bd96ec0 (patch) | |
| tree | 3be702be9c6861fbcee80e9a6bcb08e5a576fe5c | |
| parent | 71a5379bda71f19539dabac0232330561e19be1a (diff) | |
| parent | b0d25de54a62451cb5699080b69219ac12247023 (diff) | |
| download | rust-2432a16973bf50665f75cb3e56cab1611bd96ec0.tar.gz rust-2432a16973bf50665f75cb3e56cab1611bd96ec0.zip | |
Auto merge of #5162 - flip1995:gha_fix, r=flip1995
Fix GHA after the merge changelog: none
| -rw-r--r-- | .github/workflows/clippy.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/clippy_bors.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/clippy_dev.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/deploy.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/remark.yml | 4 |
5 files changed, 16 insertions, 6 deletions
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 0d7d2929000..6a9f64e88bd 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -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' diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index d147e0790a0..f77350f09b9 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -2,7 +2,9 @@ name: Clippy Test (bors) on: push: - branches: [auto, try] + branches: + - auto + - try env: RUST_BACKTRACE: 1 diff --git a/.github/workflows/clippy_dev.yml b/.github/workflows/clippy_dev.yml index d6f5db014a4..9ca2e630cbb 100644 --- a/.github/workflows/clippy_dev.yml +++ b/.github/workflows/clippy_dev.yml @@ -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: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6f79891358e..93300b6e124 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,9 +2,11 @@ name: Deploy on: push: - branches: master + branches: + - master release: - types: [created] + types: + - created env: TARGET_BRANCH: 'gh-pages' diff --git a/.github/workflows/remark.yml b/.github/workflows/remark.yml index 3544053d399..cc175e8bf24 100644 --- a/.github/workflows/remark.yml +++ b/.github/workflows/remark.yml @@ -2,7 +2,9 @@ name: Remark on: push: - branches: [auto, try] + branches: + - auto + - try pull_request: paths: - '**.md' |