Skip to content

Commit 3d19683

Browse files
committed
Merge branch 'main' into fastmethodcaller
2 parents 12a80bd + a293fa5 commit 3d19683

File tree

4,025 files changed

+552959
-392725
lines changed

Some content is hidden

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

4,025 files changed

+552959
-392725
lines changed

.azure-pipelines/ci.yml

+8-22
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,19 @@
11
variables:
22
coverage: false
33

4-
trigger: ['main', '3.9', '3.8', '3.7']
4+
trigger: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
55

66
jobs:
77
- job: Prebuild
88
displayName: Pre-build checks
99

1010
pool:
11-
vmImage: ubuntu-18.04
11+
vmImage: ubuntu-22.04
1212

1313
steps:
1414
- template: ./prebuild-checks.yml
1515

1616

17-
- job: Docs_PR
18-
displayName: Docs PR
19-
dependsOn: Prebuild
20-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
21-
22-
pool:
23-
vmImage: ubuntu-18.04
24-
25-
steps:
26-
- template: ./docs-steps.yml
27-
parameters:
28-
upload: true
29-
30-
3117
- job: macOS_CI_Tests
3218
displayName: macOS CI Tests
3319
dependsOn: Prebuild
@@ -40,7 +26,7 @@ jobs:
4026
testRunPlatform: macos
4127

4228
pool:
43-
vmImage: macos-10.14
29+
vmImage: macos-10.15
4430

4531
steps:
4632
- template: ./macos-steps.yml
@@ -52,12 +38,12 @@ jobs:
5238
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5339

5440
pool:
55-
vmImage: ubuntu-18.04
41+
vmImage: ubuntu-22.04
5642

5743
variables:
5844
testRunTitle: '$(build.sourceBranchName)-linux'
5945
testRunPlatform: linux
60-
openssl_version: 1.1.1k
46+
openssl_version: 1.1.1u
6147

6248
steps:
6349
- template: ./posix-steps.yml
@@ -78,12 +64,12 @@ jobs:
7864
)
7965
8066
pool:
81-
vmImage: ubuntu-18.04
67+
vmImage: ubuntu-22.04
8268

8369
variables:
8470
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8571
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1k
72+
openssl_version: 1.1.1u
8773

8874
steps:
8975
- template: ./posix-steps.yml
@@ -98,7 +84,7 @@ jobs:
9884
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
9985

10086
pool:
101-
vmImage: windows-2019
87+
vmImage: windows-2022
10288

10389
strategy:
10490
matrix:

.azure-pipelines/docs-steps.yml

-47
This file was deleted.

.azure-pipelines/posix-steps.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ steps:
6666
COMMAND: make
6767

6868
- ${{ if eq(parameters.patchcheck, 'true') }}:
69-
- script: ./python Tools/scripts/patchcheck.py --travis true
69+
- script: |
70+
git fetch origin
71+
./python Tools/patchcheck/patchcheck.py --ci true
7072
displayName: 'Run patchcheck.py'
7173
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
7274

.azure-pipelines/pr.yml

+8-20
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
11
variables:
22
coverage: false
33

4-
pr: ['main', '3.9', '3.8', '3.7']
4+
pr: ['main', '3.11', '3.10', '3.9', '3.8', '3.7']
55

66
jobs:
77
- job: Prebuild
88
displayName: Pre-build checks
99

1010
pool:
11-
vmImage: ubuntu-18.04
11+
vmImage: ubuntu-22.04
1212

1313
steps:
1414
- template: ./prebuild-checks.yml
1515

1616

17-
- job: Docs_PR
18-
displayName: Docs PR
19-
dependsOn: Prebuild
20-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
21-
22-
pool:
23-
vmImage: ubuntu-18.04
24-
25-
steps:
26-
- template: ./docs-steps.yml
27-
28-
2917
- job: macOS_PR_Tests
3018
displayName: macOS PR Tests
3119
dependsOn: Prebuild
@@ -38,7 +26,7 @@ jobs:
3826
testRunPlatform: macos
3927

4028
pool:
41-
vmImage: macos-10.14
29+
vmImage: macos-10.15
4230

4331
steps:
4432
- template: ./macos-steps.yml
@@ -52,12 +40,12 @@ jobs:
5240
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5341

5442
pool:
55-
vmImage: ubuntu-18.04
43+
vmImage: ubuntu-22.04
5644

5745
variables:
5846
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5947
testRunPlatform: linux
60-
openssl_version: 1.1.1k
48+
openssl_version: 1.1.1u
6149

6250
steps:
6351
- template: ./posix-steps.yml
@@ -78,12 +66,12 @@ jobs:
7866
)
7967
8068
pool:
81-
vmImage: ubuntu-18.04
69+
vmImage: ubuntu-22.04
8270

8371
variables:
8472
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8573
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1k
74+
openssl_version: 1.1.1u
8775

8876
steps:
8977
- template: ./posix-steps.yml
@@ -98,7 +86,7 @@ jobs:
9886
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
9987

10088
pool:
101-
vmImage: windows-2019
89+
vmImage: windows-2022
10290

10391
strategy:
10492
matrix:

.azure-pipelines/prebuild-checks.yml

-12
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@ steps:
1111
displayName: Fetch comparison tree
1212
condition: and(succeeded(), variables['System.PullRequest.TargetBranch'])
1313

14-
- script: |
15-
if ! git diff --name-only $(diffTarget) | grep -qE '(\.rst$|^Doc|^Misc)'
16-
then
17-
echo "No docs were updated: docs.run=false"
18-
echo "##vso[task.setvariable variable=run;isOutput=true]false"
19-
else
20-
echo "Docs were updated: docs.run=true"
21-
echo "##vso[task.setvariable variable=run;isOutput=true]true"
22-
fi
23-
displayName: Detect documentation changes
24-
name: docs
25-
2614
- script: |
2715
if ! git diff --name-only $(diffTarget) | grep -qvE '(\.rst$|^Doc|^Misc)'
2816
then

.azure-pipelines/windows-layout-steps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
displayName: Show layout info (${{ parameters.kind }})
1313

1414
- ${{ if eq(parameters.fulltest, 'true') }}:
15-
- script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)"
15+
- script: .\python.exe -m test -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results-${{ parameters.kind }}.xml" --tempdir "$(Build.BinariesDirectory)\tmp-${{ parameters.kind }}-$(arch)" -i test_launcher
1616
workingDirectory: $(Build.BinariesDirectory)\layout-${{ parameters.kind }}-$(arch)
1717
displayName: ${{ parameters.kind }} Tests
1818
env:

.azure-pipelines/windows-release.yml

-129
This file was deleted.

0 commit comments

Comments
 (0)