Skip to content

Commit c10aa97

Browse files
author
Evans Aboge (from Dev Box)
committed
Merge branch 'main' into task/migrate-acr-pipeline
2 parents bcbf5d3 + ac77fc3 commit c10aa97

File tree

416 files changed

+7060
-5789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

416 files changed

+7060
-5789
lines changed

.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,10 @@ pipelines:
1313
lastModifiedDate: 2024-09-13
1414
armory:
1515
lastModifiedDate: 2024-09-13
16+
binary:
17+
credscan:
18+
lastModifiedDate: 2025-01-27
19+
binskim:
20+
lastModifiedDate: 2025-01-27
21+
spotbugs:
22+
lastModifiedDate: 2025-01-27
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# Copyright (c) Microsoft Corporation.
2+
# Licensed under the MIT License.
3+
4+
# File initially created using https://github.com/MIchaelMainer/policyservicetoolkit/blob/main/branch_protection_export.ps1.
5+
6+
name: OpenAPI.NET-branch-protection
7+
description: Branch protection policy for the OpenAPI.NET repository
8+
resource: repository
9+
configuration:
10+
branchProtectionRules:
11+
12+
- branchNamePattern: main
13+
# This branch pattern applies to the following branches as of approximately 02/27/2025 15:28:20:
14+
# main
15+
16+
# Specifies whether this branch can be deleted. boolean
17+
allowsDeletions: false
18+
# Specifies whether forced pushes are allowed on this branch. boolean
19+
allowsForcePushes: false
20+
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
21+
dismissStaleReviews: true
22+
# Specifies whether admins can overwrite branch protection. boolean
23+
isAdminEnforced: true
24+
# Indicates whether "Require a pull request before merging" is enabled. boolean
25+
requiresPullRequestBeforeMerging: true
26+
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
27+
requiredApprovingReviewsCount: 1
28+
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
29+
requireCodeOwnersReview: true
30+
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
31+
requiresCommitSignatures: false
32+
# Are conversations required to be resolved before merging? boolean
33+
requiresConversationResolution: true
34+
# Are merge commits prohibited from being pushed to this branch. boolean
35+
requiresLinearHistory: false
36+
# 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
37+
requiredStatusChecks:
38+
- license/cla
39+
- CodeQL
40+
- Continuous Integration
41+
# Require branches to be up to date before merging. boolean
42+
requiresStrictStatusChecks: false
43+
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
44+
restrictsPushes: false
45+
# Restrict who can dismiss pull request reviews. boolean
46+
restrictsReviewDismissals: false
47+
48+
- branchNamePattern: support/v1
49+
# This branch pattern applies to the following branches as of approximately 02/27/2025 15:28:20:
50+
# support/v1
51+
52+
# Specifies whether this branch can be deleted. boolean
53+
allowsDeletions: false
54+
# Specifies whether forced pushes are allowed on this branch. boolean
55+
allowsForcePushes: false
56+
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
57+
dismissStaleReviews: true
58+
# Specifies whether admins can overwrite branch protection. boolean
59+
isAdminEnforced: true
60+
# Indicates whether "Require a pull request before merging" is enabled. boolean
61+
requiresPullRequestBeforeMerging: true
62+
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
63+
requiredApprovingReviewsCount: 1
64+
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
65+
requireCodeOwnersReview: true
66+
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
67+
requiresCommitSignatures: false
68+
# Are conversations required to be resolved before merging? boolean
69+
requiresConversationResolution: true
70+
# Are merge commits prohibited from being pushed to this branch. boolean
71+
requiresLinearHistory: false
72+
# 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
73+
requiredStatusChecks:
74+
- license/cla
75+
- CodeQL
76+
- Continuous Integration
77+
# Require branches to be up to date before merging. boolean
78+
requiresStrictStatusChecks: false
79+
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
80+
restrictsPushes: false
81+
# Restrict who can dismiss pull request reviews. boolean
82+
restrictsReviewDismissals: false
83+
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
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: 'status:waiting-for-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: 'status:waiting-for-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: 'status: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+
eventResponderTasks:
60+
- if:
61+
- payloadType: Issue_Comment
62+
- isAction:
63+
action: Created
64+
- isActivitySender:
65+
issueAuthor: True
66+
- hasLabel:
67+
label: 'status:waiting-for-author-feedback'
68+
- isOpen
69+
then:
70+
- addLabel:
71+
label: 'Needs: Attention :wave:'
72+
- removeLabel:
73+
label: 'status:waiting-for-author-feedback'
74+
description:
75+
- if:
76+
- payloadType: Issues
77+
- not:
78+
isAction:
79+
action: Closed
80+
- hasLabel:
81+
label: 'status:no-recent-activity'
82+
then:
83+
- removeLabel:
84+
label: 'status:no-recent-activity'
85+
description:
86+
- if:
87+
- payloadType: Issue_Comment
88+
- hasLabel:
89+
label: 'status:no-recent-activity'
90+
then:
91+
- removeLabel:
92+
label: 'status:no-recent-activity'
93+
description:
94+
- if:
95+
- payloadType: Pull_Request
96+
then:
97+
- inPrLabel:
98+
label: WIP
99+
description:
100+
onFailure:
101+
onSuccess:

.github/release-please.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
manifest: true
2+
primaryBranch: main
3+
handleGHRelease: true
4+
branches:
5+
- branch: support/v1
6+
manifest: true
7+
handleGHRelease: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Dependabot metadata
2121
id: metadata
22-
uses: dependabot/fetch-metadata@v2.2.0
22+
uses: dependabot/fetch-metadata@v2.3.0
2323
with:
2424
github-token: "${{ secrets.GITHUB_TOKEN }}"
2525

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CodeQL Analysis
22

33
on:
44
push:
5-
branches: [ main, dev ]
5+
branches: [ main, support/v1 ]
66
pull_request:
77
schedule:
88
- cron: '0 8 * * *'

.github/workflows/docker.yml

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ name: Publish Docker image
22
on:
33
workflow_dispatch:
44
push:
5-
branches: [main, dev, support/v1]
6-
paths: ['src/Microsoft.OpenApi.Hidi/**', '.github/workflows/**']
5+
tags: ["v*"]
6+
branches: [main]
7+
pull_request:
78
env:
89
REGISTRY: msgraphprod.azurecr.io
910
IMAGE_NAME: public/openapi/hidi
11+
PREVIEW_BRANCH: "refs/heads/main"
1012
jobs:
1113
push_to_registry:
1214
environment:
@@ -28,15 +30,25 @@ jobs:
2830
echo "::set-output name=version::${version}"
2931
shell: pwsh
3032
id: getversion
33+
- name: Get truncated run number
34+
if: contains(github.ref, env.PREVIEW_BRANCH)
35+
id: runnumber
36+
run: echo "runnumber=$(echo ${{ github.run_number }} | awk '{ print substr($0, length($0)-3, length($0)) }')" >> $GITHUB_OUTPUT
37+
- name: Get current date
38+
if: contains(github.ref, env.PREVIEW_BRANCH)
39+
id: date
40+
run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
3141
- name: Push to registry - Nightly
32-
if: ${{ github.ref == 'refs/heads/dev' }}
33-
uses: docker/build-push-action@v6.12.0
42+
if: contains(github.ref, env.PREVIEW_BRANCH)
43+
uses: docker/build-push-action@v6.14.0
3444
with:
3545
push: true
36-
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly
46+
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}-preview.${{ steps.date.outputs.date }}${{ steps.runnumber.outputs.runnumber }}
47+
build-args: |
48+
version_suffix=preview.${{ steps.date.outputs.date }}${{ steps.runnumber.outputs.runnumber }}
3749
- name: Push to registry - Release
38-
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/support/v1' }}
39-
uses: docker/build-push-action@v6.12.0
50+
if: contains(github.ref, 'refs/tags/v')
51+
uses: docker/build-push-action@v6.14.0
4052
with:
4153
push: true
4254
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}

.release-please-manifest.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "2.0.0-preview10"
3+
}

0 commit comments

Comments
 (0)