Skip to content

Commit

Permalink
Merge dependency-update workflows and fix automatic-release being tri…
Browse files Browse the repository at this point in the history
…ggered when executing action (#591)

I noticed `automatic-release` was getting triggered after executing the
`dependency-update` action manually in CircleCI.

I also noticed `weekly-run-workflow` and `dependency-update` could be
merged by merging their starting conditions
  • Loading branch information
vegaro authored Dec 18, 2023
1 parent 40e57f0 commit 8cb76b3
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -412,17 +412,13 @@ workflows:
requires:
- make-github-release

weekly-run-workflow:
when:
and:
- equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
- equal: [ "update-native-dependencies", << pipeline.schedule.name >> ]
jobs:
- dependency-update

trigger-dependency-update:
dependency-update:
when:
equal: [ dependency-update, << pipeline.parameters.action >> ]
or:
- and:
- equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
- equal: [ "update-native-dependencies", << pipeline.schedule.name >> ]
- equal: [ dependency-update, << pipeline.parameters.action >> ]
jobs:
- dependency-update

Expand All @@ -435,8 +431,11 @@ workflows:

automatic-release:
when:
not:
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
and:
- not:
equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
- not:
equal: [ dependency-update, << pipeline.parameters.action >> ]
jobs:
- release:
filters:
Expand Down

0 comments on commit 8cb76b3

Please sign in to comment.