Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit eea029d

Browse filesBrowse files
Merge branch 'main' into urls
2 parents 0e177fd + f108468 commit eea029d
Copy full SHA for eea029d

File tree

Expand file treeCollapse file tree

4,771 files changed

+1005316
-479518
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

4,771 files changed

+1005316
-479518
lines changed

‎.azure-pipelines/ci.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/ci.yml
+5-119Lines changed: 5 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,37 @@
1-
variables:
2-
manylinux: false
3-
coverage: false
4-
5-
resources:
6-
containers:
7-
- container: manylinux1
8-
image: pyca/cryptography-manylinux1:x86_64
1+
trigger: ['main', '3.12', '3.11', '3.10', '3.9', '3.8', '3.7']
92

103
jobs:
114
- job: Prebuild
125
displayName: Pre-build checks
136

147
pool:
15-
vmImage: ubuntu-16.04
8+
vmImage: ubuntu-22.04
169

1710
steps:
1811
- template: ./prebuild-checks.yml
1912

2013

21-
- job: Docs_PR
22-
displayName: Docs PR
23-
dependsOn: Prebuild
24-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['docs.run'], 'true'))
25-
26-
pool:
27-
vmImage: ubuntu-16.04
28-
29-
steps:
30-
- template: ./docs-steps.yml
31-
parameters:
32-
upload: true
33-
34-
35-
- job: macOS_CI_Tests
36-
displayName: macOS CI Tests
37-
dependsOn: Prebuild
38-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
39-
40-
variables:
41-
testRunTitle: '$(build.sourceBranchName)-macos'
42-
testRunPlatform: macos
43-
44-
pool:
45-
vmImage: xcode9-macos10.13
46-
47-
steps:
48-
- template: ./macos-steps.yml
49-
50-
51-
- job: Ubuntu_CI_Tests
52-
displayName: Ubuntu CI Tests
53-
dependsOn: Prebuild
54-
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
55-
56-
pool:
57-
vmImage: ubuntu-16.04
58-
59-
variables:
60-
testRunTitle: '$(build.sourceBranchName)-linux'
61-
testRunPlatform: linux
62-
openssl_version: 1.1.1c
63-
64-
steps:
65-
- template: ./posix-steps.yml
66-
parameters:
67-
dependencies: apt
68-
69-
70-
- job: ManyLinux1_CI_Tests
71-
displayName: ManyLinux1 CI Tests
72-
dependsOn: Prebuild
73-
condition: |
74-
and(
75-
and(
76-
succeeded(),
77-
eq(variables['manylinux'], 'true')
78-
),
79-
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
80-
)
81-
82-
pool:
83-
vmImage: ubuntu-16.04
84-
85-
container: manylinux1
86-
87-
variables:
88-
testRunTitle: '$(build.sourceBranchName)-manylinux1'
89-
testRunPlatform: manylinux1
90-
openssl_version: ''
91-
92-
steps:
93-
- template: ./posix-steps.yml
94-
parameters:
95-
dependencies: yum
96-
sudo_dependencies: ''
97-
xvfb: false
98-
patchcheck: false
99-
100-
101-
- job: Ubuntu_Coverage_CI_Tests
102-
displayName: Ubuntu CI Tests (coverage)
103-
dependsOn: Prebuild
104-
condition: |
105-
and(
106-
and(
107-
succeeded(),
108-
eq(variables['coverage'], 'true')
109-
),
110-
eq(dependencies.Prebuild.outputs['tests.run'], 'true')
111-
)
112-
113-
pool:
114-
vmImage: ubuntu-16.04
115-
116-
variables:
117-
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
118-
testRunPlatform: linux-coverage
119-
openssl_version: 1.1.1c
120-
121-
steps:
122-
- template: ./posix-steps.yml
123-
parameters:
124-
dependencies: apt
125-
coverage: true
126-
127-
12814
- job: Windows_CI_Tests
12915
displayName: Windows CI Tests
13016
dependsOn: Prebuild
13117
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
13218

13319
pool:
134-
vmImage: vs2017-win2016
20+
vmImage: windows-2022
13521

13622
strategy:
13723
matrix:
13824
win32:
13925
arch: win32
140-
buildOpt:
26+
buildOpt: '-p Win32'
14127
testRunTitle: '$(Build.SourceBranchName)-win32'
14228
testRunPlatform: win32
14329
win64:
14430
arch: amd64
14531
buildOpt: '-p x64'
14632
testRunTitle: '$(Build.SourceBranchName)-win64'
14733
testRunPlatform: win64
148-
maxParallel: 2
34+
maxParallel: 4
14935

15036
steps:
15137
- template: ./windows-steps.yml

‎.azure-pipelines/docs-steps.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/docs-steps.yml
-46Lines changed: 0 additions & 46 deletions
This file was deleted.

‎.azure-pipelines/macos-steps.yml

Copy file name to clipboardExpand all lines: .azure-pipelines/macos-steps.yml
-25Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.azure-pipelines/posix-deps-apt.sh

Copy file name to clipboardExpand all lines: .azure-pipelines/posix-deps-apt.sh
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/sh
12
apt-get update
23

34
apt-get -yq install \

‎.azure-pipelines/posix-steps.yml

Copy file name to clipboard
+9-64Lines changed: 9 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
parameters:
2-
coverage: false
3-
sudo_dependencies: sudo
4-
dependencies: apt
5-
patchcheck: true
6-
xvfb: true
7-
81
steps:
92
- checkout: self
103
clean: true
@@ -14,68 +7,20 @@ steps:
147
- script: sudo setfacl -Rb /home/vsts
158
displayName: 'Workaround ACL issue'
169

17-
- script: ${{ parameters.sudo_dependencies }} ./.azure-pipelines/posix-deps-${{ parameters.dependencies }}.sh $(openssl_version)
10+
- script: sudo ./.azure-pipelines/posix-deps-apt.sh $(openssl_version)
1811
displayName: 'Install dependencies'
1912

2013
- script: ./configure --with-pydebug
2114
displayName: 'Configure CPython (debug)'
2215

23-
- script: make -s -j4
16+
- script: make -j4
2417
displayName: 'Build CPython'
2518

26-
- ${{ if eq(parameters.coverage, 'true') }}:
27-
- script: ./python -m venv venv && ./venv/bin/python -m pip install -U coverage
28-
displayName: 'Set up virtual environment'
29-
30-
- script: ./venv/bin/python -m test.pythoninfo
31-
displayName: 'Display build info'
32-
33-
- script: |
34-
$COMMAND -m coverage run --pylib -m test \
35-
--fail-env-changed \
36-
-uall,-cpu \
37-
--junit-xml=$(build.binariesDirectory)/test-results.xml \
38-
-x test_multiprocessing_fork \
39-
-x test_multiprocessing_forkserver \
40-
-x test_multiprocessing_spawn \
41-
-x test_concurrent_futures
42-
displayName: 'Tests with coverage'
43-
env:
44-
${{ if eq(parameters.xvfb, 'true') }}:
45-
COMMAND: xvfb-run ./venv/bin/python
46-
${{ if ne(parameters.xvfb, 'true') }}:
47-
COMMAND: ./venv/bin/python
48-
49-
- script: ./venv/bin/python -m coverage xml
50-
displayName: 'Generate coverage.xml'
51-
52-
- script: source ./venv/bin/activate && bash <(curl -s https://codecov.io/bash)
53-
displayName: 'Publish code coverage results'
54-
55-
56-
- ${{ if ne(parameters.coverage, 'true') }}:
57-
- script: make pythoninfo
58-
displayName: 'Display build info'
59-
60-
- script: $COMMAND buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
61-
displayName: 'Tests'
62-
env:
63-
${{ if eq(parameters.xvfb, 'true') }}:
64-
COMMAND: xvfb-run make
65-
${{ if ne(parameters.xvfb, 'true') }}:
66-
COMMAND: make
67-
68-
- ${{ if eq(parameters.patchcheck, 'true') }}:
69-
- script: ./python Tools/scripts/patchcheck.py --travis true
70-
displayName: 'Run patchcheck.py'
71-
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
72-
19+
- script: make pythoninfo
20+
displayName: 'Display build info'
7321

74-
- task: PublishTestResults@2
75-
displayName: 'Publish Test Results'
76-
inputs:
77-
testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
78-
mergeTestResults: true
79-
testRunTitle: $(testRunTitle)
80-
platform: $(testRunPlatform)
81-
condition: succeededOrFailed()
22+
- script: |
23+
git fetch origin
24+
./python Tools/patchcheck/patchcheck.py --ci true
25+
displayName: 'Run patchcheck.py'
26+
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.