Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b7d613f

Browse files
zoobazooba
authored
Update VSTS to Azure DevOps and simplify dependencies (GH-9168)
1 parent 08bcf64 commit b7d613f

9 files changed

Lines changed: 37 additions & 123 deletions

File tree

‎.vsts/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
55

66
queue:
7-
name: Hosted Linux Preview
7+
name: 'Hosted Ubuntu 1604'
88

99
trigger:
1010
branches:

‎.vsts/install_deps.sh‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
sudo apt-get update
2+
3+
sudo apt-get -yq install \
4+
build-essential \
5+
zlib1g-dev \
6+
libbz2-dev \
7+
liblzma-dev \
8+
libncurses5-dev \
9+
libreadline6-dev \
10+
libsqlite3-dev \
11+
libssl-dev \
12+
libgdbm-dev \
13+
tk-dev \
14+
lzma \
15+
lzma-dev \
16+
liblzma-dev \
17+
libffi-dev \
18+
uuid-dev \
19+
xvfb

‎.vsts/linux-buildbot.yml‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
55

66
queue:
7-
name: Hosted Linux Preview
7+
name: 'Hosted Ubuntu 1604'
88

99
trigger:
1010
branches:
@@ -30,31 +30,9 @@ steps:
3030

3131
#- template: linux-deps.yml
3232

33-
# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
34-
# For now, we copy/paste the steps
35-
- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
36-
displayName: 'Update apt-get lists'
37-
3833
- script: echo ##vso[task.prependpath]$(OPENSSL_DIR)
3934
displayName: 'Add $(OPENSSL_DIR) to PATH'
40-
- script: >
41-
sudo apt-get -yq install
42-
build-essential
43-
zlib1g-dev
44-
libbz2-dev
45-
liblzma-dev
46-
libncurses5-dev
47-
libreadline6-dev
48-
libsqlite3-dev
49-
libssl-dev
50-
libgdbm-dev
51-
tk-dev
52-
lzma
53-
lzma-dev
54-
liblzma-dev
55-
libffi-dev
56-
uuid-dev
57-
xvfb
35+
- script: ./.vsts/install_deps.sh
5836
displayName: 'Install dependencies'
5937
- script: python3 Tools/ssl/multissltests.py --steps=library --base-directory $(build.sourcesDirectory)/multissl --openssl $(OPENSSL) --system Linux
6038
displayName: 'python multissltests.py'

‎.vsts/linux-coverage.yml‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
55

66
queue:
7-
name: Hosted Linux Preview
7+
name: 'Hosted Ubuntu 1604'
88

99
trigger:
1010
branches:
@@ -40,32 +40,9 @@ steps:
4040

4141
#- template: linux-deps.yml
4242

43-
# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
44-
# For now, we copy/paste the steps
45-
- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
46-
displayName: 'Update apt-get lists'
47-
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
48-
4943
- script: echo ##vso[task.prependpath]$(OPENSSL_DIR)
5044
displayName: 'Add $(OPENSSL_DIR) to PATH'
51-
- script: >
52-
sudo apt-get -yq install
53-
build-essential
54-
zlib1g-dev
55-
libbz2-dev
56-
liblzma-dev
57-
libncurses5-dev
58-
libreadline6-dev
59-
libsqlite3-dev
60-
libssl-dev
61-
libgdbm-dev
62-
tk-dev
63-
lzma
64-
lzma-dev
65-
liblzma-dev
66-
libffi-dev
67-
uuid-dev
68-
xvfb
45+
- script: ./.vsts/install_deps.sh
6946
displayName: 'Install dependencies'
7047
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
7148
- script: python3 Tools/ssl/multissltests.py --steps=library --base-directory $(build.sourcesDirectory)/multissl --openssl $(OPENSSL) --system Linux

‎.vsts/linux-deps.yml‎

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

‎.vsts/linux-pr.yml‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
55

66
queue:
7-
name: Hosted Linux Preview
7+
name: 'Hosted Ubuntu 1604'
88

99
trigger:
1010
branches:
@@ -40,34 +40,11 @@ steps:
4040

4141
#- template: linux-deps.yml
4242

43-
# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
44-
# For now, we copy/paste the steps
45-
- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
46-
displayName: 'Update apt-get lists'
47-
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
48-
4943
- script: echo ##vso[task.prependpath]$(OPENSSL_DIR)
5044
displayName: 'Add $(OPENSSL_DIR) to PATH'
5145
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
5246

53-
- script: >
54-
sudo apt-get -yq install
55-
build-essential
56-
zlib1g-dev
57-
libbz2-dev
58-
liblzma-dev
59-
libncurses5-dev
60-
libreadline6-dev
61-
libsqlite3-dev
62-
libssl-dev
63-
libgdbm-dev
64-
tk-dev
65-
lzma
66-
lzma-dev
67-
liblzma-dev
68-
libffi-dev
69-
uuid-dev
70-
xvfb
47+
- script: ./.vsts/install_deps.sh
7148
displayName: 'Install dependencies'
7249
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
7350

‎.vsts/macos-buildbot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
55

66
queue:
7-
name: Hosted macOS Preview
7+
name: Hosted macOS
88

99
trigger:
1010
branches:

‎.vsts/macos-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
55

66
queue:
7-
name: Hosted macOS Preview
7+
name: Hosted macOS
88

99
trigger:
1010
branches:

‎README.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ This is Python version 3.8.0 alpha 0
99
:alt: CPython build status on Appveyor
1010
:target: https://ci.appveyor.com/project/python/cpython/branch/master
1111

12-
.. image:: https://python.visualstudio.com/cpython/_apis/build/status/Linux-Buildbot?branchName=master&label=Linux
13-
:alt: CPython build status on VSTS (Linux)
14-
:target: https://python.visualstudio.com/cpython/_build/latest?definitionId=6&branchName=master
12+
.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Linux-Buildbot?branchName=master&label=Linux
13+
:alt: CPython build status on Azure DevOps (Linux)
14+
:target: https://dev.azure.com/python/cpython/_build/latest?definitionId=6&branchName=master
1515

16-
.. image:: https://python.visualstudio.com/cpython/_apis/build/status/macOS-Buildbot?branchName=master&label=macOS
17-
:alt: CPython build status on VSTS (macOS)
18-
:target: https://python.visualstudio.com/cpython/_build/latest?definitionId=5&branchName=master
16+
.. image:: https://dev.azure.com/python/cpython/_apis/build/status/macOS-Buildbot?branchName=master&label=macOS
17+
:alt: CPython build status on Azure DevOps (macOS)
18+
:target: https://dev.azure.com/python/cpython/_build/latest?definitionId=5&branchName=master
1919

20-
.. image:: https://python.visualstudio.com/cpython/_apis/build/status/Windows-Buildbot?branchName=master&label=Windows
21-
:alt: CPython build status on VSTS (Windows)
22-
:target: https://python.visualstudio.com/cpython/_build/latest?definitionId=4&branchName=master
20+
.. image:: https://dev.azure.com/python/cpython/_apis/build/status/Windows-Buildbot?branchName=master&label=Windows
21+
:alt: CPython build status on Azure DevOps (Windows)
22+
:target: https://dev.azure.com/python/cpython/_build/latest?definitionId=4&branchName=master
2323

2424
.. image:: https://codecov.io/gh/python/cpython/branch/master/graph/badge.svg
2525
:alt: CPython code coverage on Codecov

0 commit comments

Comments
 (0)