Skip to content

Wire release/7.0 into PR validation, CI pipelines, and GitHub Actions workflows #4075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdaigle merged 9 commits into from
Mar 24, 2026
Merged

Wire release/7.0 into PR validation, CI pipelines, and GitHub Actions workflows #4075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
008fa09
adapt codeql.yml for release/7.0 branch
Copilot Mar 23, 2026
85d1c4f
revert run step; set cron 1h after release/6.1
Copilot Mar 23, 2026
56f57b1
add release/7.0 triggers and schedules to PR and CI pipelines
Copilot Mar 23, 2026
cbe7687
remove main and internal/main references from pipeline files
Copilot Mar 23, 2026
ee37b39
fix duplicate schedule displayNames; backport check-milestone workflo…
Copilot Mar 23, 2026
54ef348
add GOTCHA comment; remove feat/* PR triggers; update dashboards for …
Copilot Mar 23, 2026
0d1e665
move release/7.0 dashboard entries to just below main entries
Copilot Mar 23, 2026
391eaac
Add 'copilot/*' branch to PR validation triggers
mdaigle Mar 24, 2026
022aebd
Update branch triggers for PR validation
mdaigle Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/check-milestone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Check Milestone

on:
pull_request:
types: [opened, edited, synchronize, milestoned, demilestoned]

jobs:
check-milestone:
name: Validate milestone
runs-on: ubuntu-latest
permissions:
pull-requests: read
steps:
- name: Check milestone is set
if: github.event.pull_request.milestone == null
run: |
echo "::error::This PR does not have a milestone set. Please assign a milestone before merging."
exit 1

- name: Check milestone is open
if: github.event.pull_request.milestone != null && github.event.pull_request.milestone.state != 'open'
run: |
echo "::error::Milestone '${{ github.event.pull_request.milestone.title }}' is ${{ github.event.pull_request.milestone.state }}. Please assign an open milestone."
exit 1
15 changes: 3 additions & 12 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,12 @@
name: "CodeQL Advanced"

on:
# Scan on pushes to main only.
push:
branches:
- main

# Scan on PRs that target matching branches.
branches: [ "release/7.0" ]
pull_request:
branches:
- main
- feat/**
- dev/**

# Scan weekly on Saturdays at 23:33 UTC
branches: [ "release/7.0" ]
schedule:
- cron: '33 23 * * 6'
- cron: '15 23 * * 6'
Comment thread
mdaigle marked this conversation as resolved.

jobs:
analyze:
Expand Down
2 changes: 2 additions & 0 deletions eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ The branches listed below indicate the repo branch used for the triggered runs.
|-|-|-|-|-|-|-|
|MDS Main CI|[internal/main](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
|MDS Main CI-Package|[internal/main](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
|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|
|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|
|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|
|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|
|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|
Expand Down
2 changes: 2 additions & 0 deletions eng/dashboards/public-pipelines-ci-builds-by-branch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ PR pipelines run on the topic branch associated to the PR.
|PR-SqlClient-Package|N/A|Debug|Yes|No|None|YAML|
|CI-SqlClient|[main](https://github.com/dotnet/SqlClient)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
|CI-SqlClient-Package|[main](https://github.com/dotnet/SqlClient)|Release|No|Yes|Weekdays 03:00 UTC|YAML|
|CI-SqlClient|[release/7.0](https://github.com/dotnet/SqlClient/tree/release/7.0)|Release|No|Yes|Sunday 05:00 UTC|YAML|
|CI-SqlClient-Package|[release/7.0](https://github.com/dotnet/SqlClient/tree/release/7.0)|Release|No|Yes|Sunday 05:30 UTC|YAML|
|CI-SqlClient|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:00 UTC|YAML|
|CI-SqlClient-Package|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:30 UTC|YAML|
|CI-SqlClient|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|Yes|Sunday 06:00 UTC|YAML|
Expand Down
38 changes: 19 additions & 19 deletions eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
# It runs via CI push triggers and schedules and uses the Release build
# configuration:
#
# - Commits to GitHub main
# - Commits to ADO internal/main
# - Weekdays at 03:00 UTC on GitHub main
# - Thursdays at 07:00 UTC on ADO internal/main
# - Commits to GitHub release/7.0
# - Commits to ADO internal/release/7.0
# - Sundays at 05:30 UTC on GitHub release/7.0
# - Sundays at 06:30 UTC on ADO internal/release/7.0
#
# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI. We are
Comment thread
cheenamalhotra marked this conversation as resolved.
# able to define different triggers and schedules using branch filters:
#
# - Only the GitHub repo has a 'main' branch, so its presence indicates that
# the pipeline run was triggered via GitHub.
# - Only the GitHub repo has a 'release/7.0' branch, so its presence indicates
# that the pipeline run was triggered via GitHub.
#
# - Only the ADO repo has an 'internal/main' branch.
# - Only the ADO repo has an 'internal/release/7.0' branch.
#
# Changes are batched together to ensure that the pipline never runs
# concurrently.
Expand Down Expand Up @@ -55,29 +55,29 @@ trigger:

branches:
include:
# GitHub main branch.
- main
# GitHub release/7.0 branch.
- release/7.0

# ADO internal/main branch.
- internal/main
# ADO internal/release/7.0 branch.
- internal/release/7.0

# Trigger this pipline on a schedule.
schedules:

# GitHub main on weekdays
- cron: '0 3 * * Mon-Fri'
displayName: Weekday Run (Release Config)
# GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:30 UTC run).
Comment thread
cheenamalhotra marked this conversation as resolved.
- cron: '30 5 * * Sun'
displayName: Sunday Run GitHub (Release Config)
branches:
Comment thread
mdaigle marked this conversation as resolved.
include:
- main
- release/7.0
always: true

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

# Pipeline parameters, visible in the Azure DevOps UI.
Expand Down
38 changes: 19 additions & 19 deletions eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
# It runs via CI push triggers and schedules and uses the Release build
# configuration:
#
# - Commits to GitHub main
# - Commits to ADO internal/main
# - Weekdays at 01:00 UTC on GitHub main
# - Thursdays at 05:00 UTC on ADO internal/main
# - Commits to GitHub release/7.0
# - Commits to ADO internal/release/7.0
# - Sundays at 05:00 UTC on GitHub release/7.0
# - Sundays at 06:00 UTC on ADO internal/release/7.0
#
# GOTCHA: This pipeline definition is triggered by GitHub _and_ ADO CI. We are
# able to define different triggers and schedules using branch filters:
#
# - Only the GitHub repo has a 'main' branch, so its presence indicates that
# the pipeline run was triggered via GitHub.
# - Only the GitHub repo has a 'release/7.0' branch, so its presence indicates
# that the pipeline run was triggered via GitHub.
#
# - Only the ADO repo has an 'internal/main' branch.
# - Only the ADO repo has an 'internal/release/7.0' branch.
#
# Changes are batched together to ensure that the pipline never runs
# concurrently.
Expand Down Expand Up @@ -55,29 +55,29 @@ trigger:

branches:
include:
# GitHub main branch.
- main
# GitHub release/7.0 branch.
- release/7.0

# ADO internal/main branch.
- internal/main
# ADO internal/release/7.0 branch.
- internal/release/7.0

# Trigger this pipline on a schedule.
schedules:

# GitHub main on weekdays
- cron: '0 1 * * Mon-Fri'
displayName: Weekday Run (Release Config)
# GitHub release/7.0 on Sundays (1 hour after release/6.1's 04:00 UTC run).
- cron: '0 5 * * Sun'
displayName: Sunday Run GitHub (Release Config)
branches:
Comment thread
mdaigle marked this conversation as resolved.
include:
- main
- release/7.0
always: true

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

# Pipeline parameters, visible in the Azure DevOps UI.
Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/sqlclient-pr-package-ref-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
#
# It is triggered by pushes to PRs that target dev/ and feature/ branches, and
# the main branch in GitHub.
# the release/7.0 branch in GitHub.
#
# It maps to the "PR-SqlClient-Package" pipeline in the Public project:
#
Expand All @@ -31,8 +31,7 @@ pr:
include:
# GitHub repo branch targets that will trigger PR validation builds.
- dev/*
- feat/*
- main
- release/7.0

paths:
include:
Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/sqlclient-pr-project-ref-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# - Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider
#
# It is triggered by pushes to PRs that target dev/ and feature/ branches, and
# the main branch in GitHub.
# the release/7.0 branch in GitHub.
#
# It maps to the "PR-SqlClient-Project" pipeline in the Public project:
#
Expand All @@ -31,8 +31,7 @@ pr:
include:
# GitHub repo branch targets that will trigger PR validation builds.
- dev/*
- feat/*
- main
- release/7.0

paths:
include:
Expand Down
Loading