Skip to content

Commit 8ea1b58

Browse files
baywetbaywet
authored
Merge pull request #2615 from microsoft/ci/sync-changes
ci: syncs changes from v3 to v2 branch
2 parents e919b33 + cd77cef commit 8ea1b58

File tree

8 files changed

+106
-6
lines changed

8 files changed

+106
-6
lines changed

‎.azure-pipelines/ci-build.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ trigger:
77
include:
88
- main
99
- support/v1
10+
- support/v2
1011
tags:
1112
include:
1213
- 'v*'
@@ -15,6 +16,7 @@ pr:
1516
include:
1617
- main
1718
- support/v1
19+
- support/v2
1820

1921
variables:
2022
buildPlatform: 'Any CPU'
@@ -307,6 +309,7 @@ extends:
307309
publishFeedCredentials: 'OpenAPI Nuget Connection'
308310

309311
- deployment: create_github_release
312+
condition: and(contains(variables['build.SourceBranch'], 'refs/tags/v'), succeeded())
310313
templateContext:
311314
type: releaseJob
312315
isProduction: true

‎.github/dependabot.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,23 @@ updates:
55
directory: "/"
66
open-pull-requests-limit: 10
77
schedule:
8-
interval: "weekly"
8+
interval: "daily"
99
- package-ecosystem: "nuget"
1010
# location of package manifests
1111
directory: "/"
1212
open-pull-requests-limit: 10
1313
schedule:
1414
interval: "daily"
15+
groups:
16+
MicrosoftExtensions:
17+
patterns:
18+
- "Microsoft.Extensions.*"
1519
- package-ecosystem: dotnet-sdk
1620
directory: /
1721
schedule:
18-
interval: weekly
19-
day: wednesday
22+
interval: "daily"
2023
ignore:
2124
- dependency-name: '*'
2225
update-types:
2326
- version-update:semver-major
2427
- version-update:semver-minor
25-
# Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)

‎.github/policies/OpenAPI.NET-branch-protection.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,39 @@ configuration:
8181
# Restrict who can dismiss pull request reviews. boolean
8282
restrictsReviewDismissals: false
8383

84+
- branchNamePattern: support/v2
85+
# This branch pattern applies to the following branches as of approximately 02/27/2025 15:28:20:
86+
# support/v1
87+
88+
# Specifies whether this branch can be deleted. boolean
89+
allowsDeletions: false
90+
# Specifies whether forced pushes are allowed on this branch. boolean
91+
allowsForcePushes: false
92+
# Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
93+
dismissStaleReviews: true
94+
# Specifies whether admins can overwrite branch protection. boolean
95+
isAdminEnforced: true
96+
# Indicates whether "Require a pull request before merging" is enabled. boolean
97+
requiresPullRequestBeforeMerging: true
98+
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
99+
requiredApprovingReviewsCount: 1
100+
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
101+
requireCodeOwnersReview: true
102+
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
103+
requiresCommitSignatures: false
104+
# Are conversations required to be resolved before merging? boolean
105+
requiresConversationResolution: true
106+
# Are merge commits prohibited from being pushed to this branch. boolean
107+
requiresLinearHistory: false
108+
# 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
109+
requiredStatusChecks:
110+
- license/cla
111+
- CodeQL
112+
- Continuous Integration
113+
# Require branches to be up to date before merging. boolean
114+
requiresStrictStatusChecks: false
115+
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
116+
restrictsPushes: false
117+
# Restrict who can dismiss pull request reviews. boolean
118+
restrictsReviewDismissals: false
119+

‎.github/pull_request_template.md‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Pull Request
2+
3+
<!--
4+
Thank you for contributing to OpenAPI.NET!
5+
Please fill out the template below to help us review your pull request.
6+
-->
7+
8+
## Description
9+
<!-- Provide a brief description of your changes -->
10+
11+
## Type of Change
12+
<!-- Mark the relevant option with an "x" -->
13+
- [ ] Bug fix (non-breaking change which fixes an issue)
14+
- [ ] New feature (non-breaking change which adds functionality)
15+
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
16+
- [ ] Documentation update
17+
- [ ] Other (please describe):
18+
19+
## Related Issue(s)
20+
<!-- Link to any related issues using "Fixes #123" or "Closes #123" -->
21+
22+
## Changes Made
23+
<!-- List the main changes made in this PR -->
24+
-
25+
-
26+
-
27+
28+
## Testing
29+
<!-- Describe how you tested your changes -->
30+
- [ ] Unit tests added/updated
31+
- [ ] Integration tests added/updated
32+
- [ ] Manual testing performed
33+
- [ ] All existing tests pass
34+
35+
## Checklist
36+
<!-- Mark completed items with an "x" -->
37+
- [ ] My code follows the code style of this project
38+
- [ ] I have performed a self-review of my own code
39+
- [ ] I have made corresponding changes to the documentation
40+
- [ ] My changes generate no new warnings
41+
- [ ] I have added tests that prove my fix is effective or that my feature works
42+
- [ ] New and existing unit tests pass locally with my changes
43+
44+
## Versions applicability
45+
46+
- [ ] My change applies to the version 1.X of the library, if so PR link:
47+
- [ ] My change applies to the version 2.X of the library, if so PR link:
48+
- [ ] My change applies to the version 3.X of the library, if so PR link:
49+
- [ ] I have evaluated the applicability of my change against the other versions above.
50+
51+
See [the contributing guidelines](https://github.com/microsoft/OpenAPI.NET/blob/main/CONTRIBUTING.md) for more information about how patches are applied across multiple versions.
52+
53+
## Additional Notes
54+
<!-- Add any additional information that reviewers should know -->

‎.github/release-please.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ primaryBranch: main
33
handleGHRelease: true
44
branches:
55
- branch: support/v1
6+
manifest: true
7+
handleGHRelease: true
8+
- branch: support/v2
69
manifest: true
710
handleGHRelease: true

‎.github/workflows/ci-cd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
working-directory: ./performance/benchmark
7777

7878
- name: Publish benchmark results
79-
uses: actions/upload-artifact@v4
79+
uses: actions/upload-artifact@v5
8080
with:
8181
if-no-files-found: error
8282
name: benchmark-results

‎.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, support/v1 ]
5+
branches: [ main, support/v1, support/v2 ]
66
pull_request:
77
schedule:
88
- cron: '0 8 * * *'

‎.github/workflows/release-please-gha.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ on:
1515
branches:
1616
- main
1717
- support/v1
18+
- support/v2
19+
workflow_dispatch:
1820

1921
permissions:
2022
contents: read

0 commit comments

Comments
 (0)