Skip to content

Commit 3e5a247

Browse files
baywetbaywet
authored
Merge pull request #856 from microsoftgraph/release/v6
handles merge conflicts for release
2 parents 681c7bb + 2a3df14 commit 3e5a247

File tree

12 files changed

+391
-42
lines changed

12 files changed

+391
-42
lines changed

‎.github/dependabot.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,68 @@ updates:
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 10
8+
groups:
9+
kiota-dependencies:
10+
patterns:
11+
- "*kiota*"
812
- package-ecosystem: gradle
913
directory: "/android"
1014
schedule:
1115
interval: daily
1216
open-pull-requests-limit: 10
17+
groups:
18+
kiota-dependencies:
19+
patterns:
20+
- "*kiota*"
1321
- package-ecosystem: maven
1422
directory: "/"
1523
schedule:
1624
interval: daily
1725
open-pull-requests-limit: 10
26+
groups:
27+
kiota-dependencies:
28+
patterns:
29+
- "*kiota*"
1830
- package-ecosystem: github-actions
1931
directory: "/"
2032
schedule:
2133
interval: daily
2234
open-pull-requests-limit: 10
35+
36+
# remove when v6 GAs
37+
- package-ecosystem: gradle
38+
directory: "/"
39+
schedule:
40+
interval: daily
41+
open-pull-requests-limit: 10
42+
target-branch: feature/6.0
43+
groups:
44+
kiota-dependencies:
45+
patterns:
46+
- "*kiota*"
47+
- package-ecosystem: gradle
48+
directory: "/android"
49+
schedule:
50+
interval: daily
51+
open-pull-requests-limit: 10
52+
target-branch: feature/6.0
53+
groups:
54+
kiota-dependencies:
55+
patterns:
56+
- "*kiota*"
57+
- package-ecosystem: maven
58+
directory: "/"
59+
schedule:
60+
interval: daily
61+
open-pull-requests-limit: 10
62+
target-branch: feature/6.0
63+
groups:
64+
kiota-dependencies:
65+
patterns:
66+
- "*kiota*"
67+
- package-ecosystem: github-actions
68+
directory: "/"
69+
schedule:
70+
interval: daily
71+
open-pull-requests-limit: 10
72+
target-branch: feature/6.0

‎.github/policies/msgraph-beta-sdk-java-branch-protection.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ configuration:
1818
# Specifies whether forced pushes are allowed on this branch. boolean
1919
allowsForcePushes: false
2020
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
21-
dismissStaleReviews: false
21+
dismissStaleReviews: true
2222
# Specifies whether admins can overwrite branch protection. boolean
2323
isAdminEnforced: false
2424
# Indicates whether "Require a pull request before merging" is enabled. boolean
2525
requiresPullRequestBeforeMerging: true
2626
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
2727
requiredApprovingReviewsCount: 1
2828
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
29-
requireCodeOwnersReview: false
29+
requireCodeOwnersReview: true
3030
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
3131
requiresCommitSignatures: false
3232
# Are conversations required to be resolved before merging? boolean
33-
requiresConversationResolution: false
33+
requiresConversationResolution: true
3434
# Are merge commits prohibited from being pushed to this branch. boolean
3535
requiresLinearHistory: false
3636
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
@@ -39,7 +39,7 @@ configuration:
3939
- lint-api-level
4040
- CodeQL
4141
- build
42-
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
42+
# Require branches to be up to date before merging. This should be false since the repo contains autogenerated files. boolean
4343
requiresStrictStatusChecks: false
4444
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
4545
restrictsPushes: false
@@ -67,7 +67,7 @@ configuration:
6767
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
6868
requiresCommitSignatures: false
6969
# Are conversations required to be resolved before merging? boolean
70-
requiresConversationResolution: false
70+
requiresConversationResolution: true
7171
# Are merge commits prohibited from being pushed to this branch. boolean
7272
requiresLinearHistory: false
7373
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
@@ -76,7 +76,7 @@ configuration:
7676
- lint-api-level
7777
- build
7878
- CodeQL
79-
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
79+
# Require branches to be up to date before merging. This should be false since the repo contains autogenerated files. boolean
8080
requiresStrictStatusChecks: false
8181
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
8282
restrictsPushes: false

‎.github/policies/resourceManagement.yml‎

Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
scheduledSearches:
11+
- description:
12+
frequencies:
13+
- hourly:
14+
hour: 6
15+
filters:
16+
- isIssue
17+
- isOpen
18+
- hasLabel:
19+
label: 'Needs: author feedback'
20+
- hasLabel:
21+
label: 'Status: no recent activity'
22+
- noActivitySince:
23+
days: 3
24+
actions:
25+
- closeIssue
26+
- description:
27+
frequencies:
28+
- hourly:
29+
hour: 6
30+
filters:
31+
- isIssue
32+
- isOpen
33+
- hasLabel:
34+
label: 'Needs: author feedback'
35+
- noActivitySince:
36+
days: 4
37+
- isNotLabeledWith:
38+
label: 'Status: no recent activity'
39+
actions:
40+
- addLabel:
41+
label: 'Status: no recent activity'
42+
- addReply:
43+
reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
44+
- description:
45+
frequencies:
46+
- hourly:
47+
hour: 6
48+
filters:
49+
- isIssue
50+
- isOpen
51+
- hasLabel:
52+
label: duplicate
53+
- noActivitySince:
54+
days: 1
55+
actions:
56+
- addReply:
57+
reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
58+
- closeIssue
59+
- description:
60+
frequencies:
61+
- hourly:
62+
hour: 6
63+
filters:
64+
- isPullRequest
65+
- isOpen
66+
- hasLabel:
67+
label: 'Needs: author feedback'
68+
- hasLabel:
69+
label: 'Status: no recent activity'
70+
- noActivitySince:
71+
days: 7
72+
actions:
73+
- closeIssue
74+
- description:
75+
frequencies:
76+
- hourly:
77+
hour: 6
78+
filters:
79+
- isPullRequest
80+
- isOpen
81+
- hasLabel:
82+
label: 'Needs: author feedback'
83+
- noActivitySince:
84+
days: 7
85+
- isNotLabeledWith:
86+
label: 'Status: no recent activity'
87+
actions:
88+
- addLabel:
89+
label: 'Status: no recent activity'
90+
- addReply:
91+
reply: This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **7 days**. It will be closed if no further activity occurs **within 7 days of this comment**.
92+
eventResponderTasks:
93+
- if:
94+
- payloadType: Issue_Comment
95+
- isAction:
96+
action: Created
97+
- isActivitySender:
98+
issueAuthor: True
99+
- hasLabel:
100+
label: 'Needs: author feedback'
101+
- isOpen
102+
then:
103+
- addLabel:
104+
label: 'Needs: attention :wave:'
105+
- removeLabel:
106+
label: 'Needs: author feedback'
107+
description:
108+
- if:
109+
- payloadType: Issues
110+
- not:
111+
isAction:
112+
action: Closed
113+
- hasLabel:
114+
label: 'Status: no recent activity'
115+
then:
116+
- removeLabel:
117+
label: 'Status: no recent activity'
118+
description:
119+
- if:
120+
- payloadType: Issue_Comment
121+
- hasLabel:
122+
label: 'Status: no recent activity'
123+
then:
124+
- removeLabel:
125+
label: 'Status: no recent activity'
126+
description:
127+
- if:
128+
- payloadType: Pull_Request
129+
then:
130+
- inPrLabel:
131+
label: 'Status: In PR'
132+
description:
133+
- if:
134+
- payloadType: Pull_Request
135+
- isAction:
136+
action: Opened
137+
then:
138+
- addCodeFlowLink
139+
description:
140+
- if:
141+
- payloadType: Pull_Request_Review
142+
- isAction:
143+
action: Submitted
144+
- isReviewState:
145+
reviewState: Changes_requested
146+
then:
147+
- addLabel:
148+
label: 'Needs: author feedback'
149+
description:
150+
- if:
151+
- payloadType: Pull_Request
152+
- isActivitySender:
153+
issueAuthor: True
154+
- not:
155+
isAction:
156+
action: Closed
157+
- hasLabel:
158+
label: 'Needs: author feedback'
159+
then:
160+
- removeLabel:
161+
label: 'Needs: author feedback'
162+
description:
163+
- if:
164+
- payloadType: Issue_Comment
165+
- isActivitySender:
166+
issueAuthor: True
167+
- hasLabel:
168+
label: 'Needs: author feedback'
169+
then:
170+
- removeLabel:
171+
label: 'Needs: author feedback'
172+
description:
173+
- if:
174+
- payloadType: Pull_Request_Review
175+
- isActivitySender:
176+
issueAuthor: True
177+
- hasLabel:
178+
label: 'Needs: author feedback'
179+
then:
180+
- removeLabel:
181+
label: 'Needs: author feedback'
182+
description:
183+
- if:
184+
- payloadType: Pull_Request
185+
- not:
186+
isAction:
187+
action: Closed
188+
- hasLabel:
189+
label: 'Status: no recent activity'
190+
then:
191+
- removeLabel:
192+
label: 'Status: no recent activity'
193+
description:
194+
- if:
195+
- payloadType: Issue_Comment
196+
- hasLabel:
197+
label: 'Status: no recent activity'
198+
then:
199+
- removeLabel:
200+
label: 'Status: no recent activity'
201+
description:
202+
- if:
203+
- payloadType: Pull_Request_Review
204+
- hasLabel:
205+
label: 'Status: no recent activity'
206+
then:
207+
- removeLabel:
208+
label: 'Status: no recent activity'
209+
description:
210+
- if:
211+
- payloadType: Pull_Request
212+
- hasLabel:
213+
label: auto merge
214+
then:
215+
- enableAutoMerge:
216+
mergeMethod: Merge
217+
description:
218+
- if:
219+
- payloadType: Pull_Request
220+
- labelRemoved:
221+
label: auto merge
222+
then:
223+
- disableAutoMerge
224+
description:
225+
onFailure:
226+
onSuccess:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4646

4747
- name: Set up JDK
48-
uses: actions/setup-java@v3
48+
uses: actions/setup-java@v4
4949
with:
5050
java-version: 20
51-
distribution: 'oracle'
51+
distribution: 'temurin'
5252
cache: gradle
5353

5454
# Initializes the CodeQL tools for scanning.

0 commit comments

Comments
 (0)