Skip to content

Commit d5b6193

Browse files
authored
Merge branch 'main' into master
2 parents fc37260 + 97e7004 commit d5b6193

File tree

3,204 files changed

+435358
-273768
lines changed

Some content is hidden

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

3,204 files changed

+435358
-273768
lines changed

.azure-pipelines/ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
variables:
22
coverage: false
33

4-
trigger: ['master', '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-20.04
1212

1313
steps:
1414
- template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
2020
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
2121

2222
pool:
23-
vmImage: ubuntu-18.04
23+
vmImage: ubuntu-20.04
2424

2525
steps:
2626
- template: ./docs-steps.yml
@@ -40,7 +40,7 @@ jobs:
4040
testRunPlatform: macos
4141

4242
pool:
43-
vmImage: macos-10.14
43+
vmImage: macos-10.15
4444

4545
steps:
4646
- template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
5252
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5353

5454
pool:
55-
vmImage: ubuntu-18.04
55+
vmImage: ubuntu-20.04
5656

5757
variables:
5858
testRunTitle: '$(build.sourceBranchName)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1k
60+
openssl_version: 1.1.1q
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
7878
)
7979
8080
pool:
81-
vmImage: ubuntu-18.04
81+
vmImage: ubuntu-20.04
8282

8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1k
86+
openssl_version: 1.1.1q
8787

8888
steps:
8989
- template: ./posix-steps.yml
@@ -98,7 +98,7 @@ jobs:
9898
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
9999

100100
pool:
101-
vmImage: windows-2019
101+
vmImage: windows-2022
102102

103103
strategy:
104104
matrix:

.azure-pipelines/posix-steps.yml

Lines changed: 3 additions & 1 deletion
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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
variables:
22
coverage: false
33

4-
pr: ['master', '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-20.04
1212

1313
steps:
1414
- template: ./prebuild-checks.yml
@@ -20,7 +20,7 @@ jobs:
2020
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
2121

2222
pool:
23-
vmImage: ubuntu-18.04
23+
vmImage: ubuntu-20.04
2424

2525
steps:
2626
- template: ./docs-steps.yml
@@ -38,7 +38,7 @@ jobs:
3838
testRunPlatform: macos
3939

4040
pool:
41-
vmImage: macos-10.14
41+
vmImage: macos-10.15
4242

4343
steps:
4444
- template: ./macos-steps.yml
@@ -52,12 +52,12 @@ jobs:
5252
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
5353

5454
pool:
55-
vmImage: ubuntu-18.04
55+
vmImage: ubuntu-20.04
5656

5757
variables:
5858
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
5959
testRunPlatform: linux
60-
openssl_version: 1.1.1k
60+
openssl_version: 1.1.1q
6161

6262
steps:
6363
- template: ./posix-steps.yml
@@ -78,12 +78,12 @@ jobs:
7878
)
7979
8080
pool:
81-
vmImage: ubuntu-18.04
81+
vmImage: ubuntu-20.04
8282

8383
variables:
8484
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
8585
testRunPlatform: linux-coverage
86-
openssl_version: 1.1.1k
86+
openssl_version: 1.1.1q
8787

8888
steps:
8989
- template: ./posix-steps.yml
@@ -98,7 +98,7 @@ jobs:
9898
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
9999

100100
pool:
101-
vmImage: windows-2019
101+
vmImage: windows-2022
102102

103103
strategy:
104104
matrix:

.azure-pipelines/windows-release.yml

Lines changed: 0 additions & 129 deletions
This file was deleted.

.azure-pipelines/windows-release/build-steps.yml

Lines changed: 0 additions & 84 deletions
This file was deleted.

.azure-pipelines/windows-release/checkout.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)