Skip to content
This repository has been archived by the owner on Feb 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #82 from Financial-Times/nori/CPP-298-renovate-nor…
Browse files Browse the repository at this point in the history
…i-wait-for-approval

CPP-298 Wait for approval on CircleCI builds from nori and renovate PRs
  • Loading branch information
emortong authored Nov 9, 2020
2 parents aad2393 + 49ae2a9 commit ddeeeef
Showing 1 changed file with 24 additions and 5 deletions.
29 changes: 24 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ references:
branches:
only: master

filters_ignore_master: &filters_ignore_master
branches:
ignore: master

filters_ignore_tags: &filters_ignore_tags
tags:
ignore: /.*/
Expand All @@ -50,6 +46,16 @@ references:
branches:
ignore: /.*/

filters_only_renovate_nori: &filters_only_renovate_nori
branches:
only: /(^renovate-.*|^nori/.*)/

filters_ignore_tags_renovate_nori: &filters_ignore_tags_renovate_nori
tags:
ignore: /.*/
branches:
ignore: /(^renovate-.*|^nori/.*)/

version: 2

jobs:
Expand Down Expand Up @@ -120,7 +126,7 @@ workflows:
jobs:
- build:
filters:
<<: *filters_ignore_tags
<<: *filters_ignore_tags_renovate_nori
- test:
requires:
- build
Expand All @@ -141,6 +147,19 @@ workflows:
requires:
- test

renovate-nori-build-test:
jobs:
- waiting-for-approval:
type: approval
filters:
<<: *filters_only_renovate_nori
- build:
requires:
- waiting-for-approval
- test:
requires:
- build

nightly:
triggers:
- schedule:
Expand Down

0 comments on commit ddeeeef

Please sign in to comment.