Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/remove-vendor-field-hex
Browse files Browse the repository at this point in the history
  • Loading branch information
faustbrian authored Oct 3, 2019
2 parents 88d88b6 + 6de1767 commit 30fb722
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Benchmark
on:
push:
branches:
- "*"
- "*/*"
- "master"
- "develop"
pull_request:
types: [ready_for_review, synchronize, opened] # fix: synchronize triggers builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
types: [ready_for_review, synchronize, opened]

jobs:
crypto:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/functional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Functional
on:
push:
branches:
- "*"
- "*/*"
- "master"
- "develop"
pull_request:
types: [ready_for_review, synchronize, opened] # fix: synchronize triggers builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
types: [ready_for_review, synchronize, opened]

jobs:
bridgechain-registration:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Test
on:
push:
branches:
- "*"
- "*/*"
- "master"
- "develop"
pull_request:
types: [ready_for_review, synchronize, opened] # fix: synchronize triggers builds for PR merges with the base branch, currently causes duplicate builds as synchronize is treated the same as push for everything besides merges
types: [ready_for_review, synchronize, opened]

jobs:
unit:
Expand Down

0 comments on commit 30fb722

Please sign in to comment.