Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Auto-merge dependabot updates

on:
pull_request:
branches: [ main ]
branches: [ dev ]

permissions:
pull-requests: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/conflicting-pr-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ name: PullRequestConflicting
# events but only for the master branch
on:
push:
branches: [master, dev, support/5.x.x]
branches: [dev, support/5.x.x]
pull_request:
types: [synchronize]
branches: [master, dev, support/5.x.x]
branches: [dev, support/5.x.x]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ on:
branches: [dev, support/5.x.x]
pull_request:
branches: [dev, support/5.x.x]
paths-ignore:
- '.gradle/wrapper'
- '.gitignore'
- 'LICENSE'
- 'THIRD PARTY NOTICES'
- '*.md'
workflow_dispatch:

jobs:
Expand Down