Skip to content

Commit da09a86

Browse files
committed
Merge main, resolve conflicts (keep connstr_to_pycore_params)
2 parents 621391a + 5a2187d commit da09a86

File tree

8 files changed

+297
-39
lines changed

8 files changed

+297
-39
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Auto Acknowledge GH Issues
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
7+
permissions:
8+
contents: read
9+
issues: write
10+
jobs:
11+
acknowledge:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
issues: write
15+
steps:
16+
# Step 1: Wait 15 minutes
17+
- name: Wait 15 minutes
18+
run: sleep 900
19+
20+
# Step 2: Check if a maintainer already responded
21+
- name: Check for existing maintainer response
22+
id: check
23+
uses: actions/github-script@v7
24+
with:
25+
github-token: ${{ secrets.GITHUB_TOKEN }}
26+
script: |
27+
const maintainers = ['sumitmsft','dlevy-msft-sql','gargsaumya','bewithgaurav','subrata-ms','jahnvi480','saurabh500'];
28+
29+
const comments = await github.rest.issues.listComments({
30+
owner: context.repo.owner,
31+
repo: context.repo.repo,
32+
issue_number: context.payload.issue.number
33+
});
34+
35+
const maintainerReplied = comments.data.some(
36+
comment => maintainers.includes(comment.user.login)
37+
);
38+
39+
core.setOutput('skip', maintainerReplied.toString());
40+
console.log(`Maintainer already replied: ${maintainerReplied}`);
41+
42+
# Step 3: Post acknowledgement ONLY if no maintainer has responded
43+
- name: Post acknowledgement comment
44+
if: steps.check.outputs.skip == 'false'
45+
uses: actions/github-script@v7
46+
with:
47+
github-token: ${{ secrets.GITHUB_TOKEN }}
48+
script: |
49+
await github.rest.issues.createComment({
50+
owner: context.repo.owner,
51+
repo: context.repo.repo,
52+
issue_number: context.payload.issue.number,
53+
body: `Hi @${context.payload.issue.user.login}, thank you for opening this issue!\n\nOur team will review it shortly. We aim to triage all new issues within 24-48 hours and get back to you.\n\nIf you have additional information to share, please feel free to update the issue.\n\nThank you for your patience!`
54+
});
55+
56+
# Step 4: Add "triage needed" label if no maintainer has responded
57+
- name: Add triage needed label
58+
if: steps.check.outputs.skip == 'false'
59+
uses: actions/github-script@v7
60+
with:
61+
github-token: ${{ secrets.GITHUB_TOKEN }}
62+
script: |
63+
await github.rest.issues.addLabels({
64+
owner: context.repo.owner,
65+
repo: context.repo.repo,
66+
issue_number: context.payload.issue.number,
67+
labels: ['triage needed']
68+
});

OneBranchPipelines/build-release-package-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ extends:
201201
parameters:
202202
# Pool Configuration
203203
# Different platforms use different agent pools:
204-
# - Windows: Custom 1ES pool (Django-1ES-pool) with WIN22-SQL22 image (Windows Server 2022 + SQL Server 2022)
205-
# - Linux: Custom 1ES pool (Django-1ES-pool) with ADO-UB22-SQL22 image (Ubuntu 22.04 + SQL Server 2022)
204+
# - Windows: Custom 1ES pool (Python-1ES-pool) with PYTHON-1ES-MMS2022 image (Windows Server 2022 + SQL Server 2022)
205+
# - Linux: Custom 1ES pool (Python-1ES-pool) with PYTHON-1ES-UB2404 image (Ubuntu 24.04 + SQL Server 2022)
206206
# - macOS: Microsoft-hosted pool (Azure Pipelines) with macOS-14 image (macOS Sonoma)
207207
# Note: Container definitions section present but unused (pools configured in individual stage templates)
208208

OneBranchPipelines/dummy-release-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ extends:
9696
pool:
9797
type: windows
9898
isCustom: true
99-
name: Django-1ES-pool
99+
name: Python-1ES-pool
100100
demands:
101-
- imageOverride -equals WIN22-SQL22
101+
- imageOverride -equals PYTHON-1ES-MMS2022
102102

103103
variables:
104104
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'

OneBranchPipelines/official-release-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ extends:
9999
pool:
100100
type: windows
101101
isCustom: true
102-
name: Django-1ES-pool
102+
name: Python-1ES-pool
103103
demands:
104-
- imageOverride -equals WIN22-SQL22
104+
- imageOverride -equals PYTHON-1ES-MMS2022
105105

106106
variables:
107107
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'

OneBranchPipelines/stages/build-linux-single-stage.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ stages:
3535
pool:
3636
type: linux
3737
isCustom: true
38-
name: Django-1ES-pool
38+
name: Python-1ES-pool
3939
demands:
40-
- imageOverride -equals ADO-UB22-SQL22
40+
- imageOverride -equals PYTHON-1ES-UB2404
4141
# Extended timeout for multi-version builds + testing (5 Python versions × build + test time)
4242
timeoutInMinutes: 120
4343

@@ -65,12 +65,8 @@ stages:
6565
- checkout: self
6666
fetchDepth: 0
6767

68-
# Install Docker
69-
- task: DockerInstaller@0
70-
inputs:
71-
dockerVersion: '20.10.21'
72-
displayName: 'Install Docker'
73-
68+
# Docker is pre-installed now
69+
# Verify it's working and start the daemon
7470
- bash: |
7571
set -e
7672
echo "Verifying we're on Linux..."
@@ -82,9 +78,14 @@ stages:
8278
8379
uname -a
8480
85-
# Start dockerd
86-
sudo dockerd > docker.log 2>&1 &
87-
sleep 10
81+
# Check if Docker daemon is already running
82+
if ! docker info > /dev/null 2>&1; then
83+
echo "Docker daemon not running, starting it..."
84+
sudo dockerd > docker.log 2>&1 &
85+
sleep 10
86+
else
87+
echo "Docker daemon already running"
88+
fi
8889
8990
# Verify Docker works
9091
docker --version

OneBranchPipelines/stages/build-windows-single-stage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ stages:
3838
pool:
3939
type: windows
4040
isCustom: true
41-
name: Django-1ES-pool
41+
name: Python-1ES-pool
4242
demands:
43-
- imageOverride -equals WIN22-SQL22
43+
- imageOverride -equals PYTHON-1ES-MMS2022
4444
# Extended timeout for downloads, builds, and testing
4545
timeoutInMinutes: 120
4646

0 commit comments

Comments
 (0)