Skip to content

Commit 48b93b0

Browse files
authored
Merge branch 'dev' into v1.0/pipelinebuild/148567
2 parents 933099a + 9d81ea8 commit 48b93b0

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

.github/workflows/auto-merge-dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Auto-merge dependabot updates
22

33
on:
44
pull_request:
5-
branches: [ main ]
5+
branches: [ dev ]
66

77
permissions:
88
pull-requests: write

.github/workflows/conflicting-pr-label.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ name: PullRequestConflicting
66
# events but only for the master branch
77
on:
88
push:
9-
branches: [master, dev, support/5.x.x]
9+
branches: [dev, support/5.x.x]
1010
pull_request:
1111
types: [synchronize]
12-
branches: [master, dev, support/5.x.x]
12+
branches: [dev, support/5.x.x]
1313

1414
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1515
jobs:

.github/workflows/gradle-build.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ on:
55
branches: [dev, support/5.x.x]
66
pull_request:
77
branches: [dev, support/5.x.x]
8-
paths-ignore:
9-
- '.gradle/wrapper'
10-
- '.gitignore'
11-
- 'LICENSE'
12-
- 'THIRD PARTY NOTICES'
13-
- '*.md'
148
workflow_dispatch:
159

1610
jobs:

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Resources:
77
- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
88
- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
99
- Contact [[email protected]](mailto:[email protected]) with questions or concerns
10+
- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)

0 commit comments

Comments
 (0)