Skip to content

Commit 10d2a55

Browse files
authored
Wire release/7.0 into PR validation, CI pipelines, and GitHub Actions workflows (#4075)
1 parent 48b8262 commit 10d2a55

8 files changed

Lines changed: 73 additions & 56 deletions
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Check Milestone
2+
3+
on:
4+
pull_request:
5+
types: [opened, edited, synchronize, milestoned, demilestoned]
6+
7+
jobs:
8+
check-milestone:
9+
name: Validate milestone
10+
runs-on: ubuntu-latest
11+
permissions:
12+
pull-requests: read
13+
steps:
14+
- name: Check milestone is set
15+
if: github.event.pull_request.milestone == null
16+
run: |
17+
echo "::error::This PR does not have a milestone set. Please assign a milestone before merging."
18+
exit 1
19+
20+
- name: Check milestone is open
21+
if: github.event.pull_request.milestone != null && github.event.pull_request.milestone.state != 'open'
22+
run: |
23+
echo "::error::Milestone '${{ github.event.pull_request.milestone.title }}' is ${{ github.event.pull_request.milestone.state }}. Please assign an open milestone."
24+
exit 1

.github/workflows/codeql.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,12 @@
1212
name: "CodeQL Advanced"
1313

1414
on:
15-
# Scan on pushes to main only.
1615
push:
17-
branches:
18-
- main
19-
20-
# Scan on PRs that target matching branches.
16+
branches: [ "release/7.0" ]
2117
pull_request:
22-
branches:
23-
- main
24-
- feat/**
25-
- dev/**
26-
27-
# Scan weekly on Saturdays at 23:33 UTC
18+
branches: [ "release/7.0" ]
2819
schedule:
29-
- cron: '33 23 * * 6'
20+
- cron: '15 23 * * 6'
3021

3122
jobs:
3223
analyze:

eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ The branches listed below indicate the repo branch used for the triggered runs.
1313
|-|-|-|-|-|-|-|
1414
|MDS Main CI|[internal/main](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
1515
|MDS Main CI-Package|[internal/main](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
16+
|MDS Main CI|[internal/release/7.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F7.0&_a=contents)|Release|No|Yes|Sunday 06:00 UTC|YAML|
17+
|MDS Main CI-Package|[internal/release/7.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F7.0&_a=contents)|Release|No|Yes|Sunday 06:30 UTC|YAML|
1618
|MDS Main CI|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
1719
|MDS Main CI-Package|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
1820
|MDS Main CI|[internal/release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.0&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML|

eng/dashboards/public-pipelines-ci-builds-by-branch.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ PR pipelines run on the topic branch associated to the PR.
1616
|PR-SqlClient-Package|N/A|Debug|Yes|No|None|YAML|
1717
|CI-SqlClient|[main](https://github.com/dotnet/SqlClient)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
1818
|CI-SqlClient-Package|[main](https://github.com/dotnet/SqlClient)|Release|No|Yes|Weekdays 03:00 UTC|YAML|
19+
|CI-SqlClient|[release/7.0](https://github.com/dotnet/SqlClient/tree/release/7.0)|Release|No|Yes|Sunday 05:00 UTC|YAML|
20+
|CI-SqlClient-Package|[release/7.0](https://github.com/dotnet/SqlClient/tree/release/7.0)|Release|No|Yes|Sunday 05:30 UTC|YAML|
1921
|CI-SqlClient|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:00 UTC|YAML|
2022
|CI-SqlClient-Package|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:30 UTC|YAML|
2123
|CI-SqlClient|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|Yes|Sunday 06:00 UTC|YAML|

eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
# It runs via CI push triggers and schedules and uses the Release build
1515
# configuration:
1616
#
17-
# - Commits to GitHub main
18-
# - Commits to ADO internal/main
19-
# - Weekdays at 03:00 UTC on GitHub main
20-
# - Thursdays at 07:00 UTC on ADO internal/main
17+
# - Commits to GitHub release/7.0
18+
# - Commits to ADO internal/release/7.0
19+
# - Sundays at 05:30 UTC on GitHub release/7.0
20+
# - Sundays at 06:30 UTC on ADO internal/release/7.0
2121
#
2222
# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI. We are
2323
# able to define different triggers and schedules using branch filters:
2424
#
25-
# - Only the GitHub repo has a 'main' branch, so its presence indicates that
26-
# the pipeline run was triggered via GitHub.
25+
# - Only the GitHub repo has a 'release/7.0' branch, so its presence indicates
26+
# that the pipeline run was triggered via GitHub.
2727
#
28-
# - Only the ADO repo has an 'internal/main' branch.
28+
# - Only the ADO repo has an 'internal/release/7.0' branch.
2929
#
3030
# Changes are batched together to ensure that the pipline never runs
3131
# concurrently.
@@ -55,29 +55,29 @@ trigger:
5555

5656
branches:
5757
include:
58-
# GitHub main branch.
59-
- main
58+
# GitHub release/7.0 branch.
59+
- release/7.0
6060

61-
# ADO internal/main branch.
62-
- internal/main
61+
# ADO internal/release/7.0 branch.
62+
- internal/release/7.0
6363

6464
# Trigger this pipline on a schedule.
6565
schedules:
6666

67-
# GitHub main on weekdays
68-
- cron: '0 3 * * Mon-Fri'
69-
displayName: Weekday Run (Release Config)
67+
# GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:30 UTC run).
68+
- cron: '30 5 * * Sun'
69+
displayName: Sunday Run GitHub (Release Config)
7070
branches:
7171
include:
72-
- main
72+
- release/7.0
7373
always: true
7474

75-
# ADO internal/main on Thursdays.
76-
- cron: '0 7 * * Thu'
77-
displayName: Thursday Run (Release Config)
75+
# ADO internal/release/7.0 on Sundays (1 hour after release/6.1's 05:30 UTC run).
76+
- cron: '30 6 * * Sun'
77+
displayName: Sunday Run ADO Internal (Release Config)
7878
branches:
7979
include:
80-
- internal/main
80+
- internal/release/7.0
8181
always: true
8282

8383
# Pipeline parameters, visible in the Azure DevOps UI.

eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
# It runs via CI push triggers and schedules and uses the Release build
1515
# configuration:
1616
#
17-
# - Commits to GitHub main
18-
# - Commits to ADO internal/main
19-
# - Weekdays at 01:00 UTC on GitHub main
20-
# - Thursdays at 05:00 UTC on ADO internal/main
17+
# - Commits to GitHub release/7.0
18+
# - Commits to ADO internal/release/7.0
19+
# - Sundays at 05:00 UTC on GitHub release/7.0
20+
# - Sundays at 06:00 UTC on ADO internal/release/7.0
2121
#
2222
# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI. We are
2323
# able to define different triggers and schedules using branch filters:
2424
#
25-
# - Only the GitHub repo has a 'main' branch, so its presence indicates that
26-
# the pipeline run was triggered via GitHub.
25+
# - Only the GitHub repo has a 'release/7.0' branch, so its presence indicates
26+
# that the pipeline run was triggered via GitHub.
2727
#
28-
# - Only the ADO repo has an 'internal/main' branch.
28+
# - Only the ADO repo has an 'internal/release/7.0' branch.
2929
#
3030
# Changes are batched together to ensure that the pipline never runs
3131
# concurrently.
@@ -55,29 +55,29 @@ trigger:
5555

5656
branches:
5757
include:
58-
# GitHub main branch.
59-
- main
58+
# GitHub release/7.0 branch.
59+
- release/7.0
6060

61-
# ADO internal/main branch.
62-
- internal/main
61+
# ADO internal/release/7.0 branch.
62+
- internal/release/7.0
6363

6464
# Trigger this pipline on a schedule.
6565
schedules:
6666

67-
# GitHub main on weekdays
68-
- cron: '0 1 * * Mon-Fri'
69-
displayName: Weekday Run (Release Config)
67+
# GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:00 UTC run).
68+
- cron: '0 5 * * Sun'
69+
displayName: Sunday Run GitHub (Release Config)
7070
branches:
7171
include:
72-
- main
72+
- release/7.0
7373
always: true
7474

75-
# ADO internal/main on Thursdays.
76-
- cron: '0 5 * * Thu'
77-
displayName: Thursday Run (Release Config)
75+
# ADO internal/release/7.0 on Sundays (1 hour after release/6.1's 05:00 UTC run).
76+
- cron: '0 6 * * Sun'
77+
displayName: Sunday Run ADO Internal (Release Config)
7878
branches:
7979
include:
80-
- internal/main
80+
- internal/release/7.0
8181
always: true
8282

8383
# Pipeline parameters, visible in the Azure DevOps UI.

eng/pipelines/sqlclient-pr-package-ref-pipeline.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
1313
#
1414
# It is triggered by pushes to PRs that target dev/ and feature/ branches, and
15-
# the main branch in GitHub.
15+
# the release/7.0 branch in GitHub.
1616
#
1717
# It maps to the "PR-SqlClient-Package" pipeline in the Public project:
1818
#
@@ -31,8 +31,7 @@ pr:
3131
include:
3232
# GitHub repo branch targets that will trigger PR validation builds.
3333
- dev/*
34-
- feat/*
35-
- main
34+
- release/7.0
3635

3736
paths:
3837
include:

eng/pipelines/sqlclient-pr-project-ref-pipeline.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
1313
#
1414
# It is triggered by pushes to PRs that target dev/ and feature/ branches, and
15-
# the main branch in GitHub.
15+
# the release/7.0 branch in GitHub.
1616
#
1717
# It maps to the "PR-SqlClient-Project" pipeline in the Public project:
1818
#
@@ -31,8 +31,7 @@ pr:
3131
include:
3232
# GitHub repo branch targets that will trigger PR validation builds.
3333
- dev/*
34-
- feat/*
35-
- main
34+
- release/7.0
3635

3736
paths:
3837
include:

0 commit comments

Comments
 (0)