Skip to content

Commit 7f76eeb

Browse files
authored
Update VSTS to Azure DevOps and simplify dependencies (GH-9168)
1 parent ccbbdd0 commit 7f76eeb

9 files changed

Lines changed: 35 additions & 122 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 & 26 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:
@@ -25,31 +25,7 @@ steps:
2525
clean: true
2626
fetchDepth: 5
2727

28-
#- template: linux-deps.yml
29-
30-
# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
31-
# For now, we copy/paste the steps
32-
- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
33-
displayName: 'Update apt-get lists'
34-
35-
- script: >
36-
sudo apt-get -yq install
37-
build-essential
38-
zlib1g-dev
39-
libbz2-dev
40-
liblzma-dev
41-
libncurses5-dev
42-
libreadline6-dev
43-
libsqlite3-dev
44-
libssl-dev
45-
libgdbm-dev
46-
tk-dev
47-
lzma
48-
lzma-dev
49-
liblzma-dev
50-
libffi-dev
51-
uuid-dev
52-
xvfb
28+
- script: ./.vsts/install_deps.sh
5329
displayName: 'Install dependencies'
5430

5531
- script: ./configure --with-pydebug

.vsts/linux-coverage.yml

Lines changed: 3 additions & 28 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:
@@ -35,34 +35,9 @@ steps:
3535
displayName: Detect doc-only changes
3636
condition: and(succeeded(), variables['system.pullRequest.targetBranch'])
3737

38-
#- template: linux-deps.yml
39-
40-
# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
41-
# For now, we copy/paste the steps
42-
- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
43-
displayName: 'Update apt-get lists'
44-
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
45-
46-
- script: >
47-
sudo apt-get -yq install
48-
build-essential
49-
zlib1g-dev
50-
libbz2-dev
51-
liblzma-dev
52-
libncurses5-dev
53-
libreadline6-dev
54-
libsqlite3-dev
55-
libssl-dev
56-
libgdbm-dev
57-
tk-dev
58-
lzma
59-
lzma-dev
60-
liblzma-dev
61-
libffi-dev
62-
uuid-dev
63-
xvfb
38+
- script: ./.vsts/install_deps.sh
6439
displayName: 'Install dependencies'
65-
40+
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
6641

6742
- script: ./configure --with-pydebug
6843
displayName: 'Configure CPython (debug)'

.vsts/linux-deps.yml

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

.vsts/linux-pr.yml

Lines changed: 2 additions & 28 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:
@@ -35,36 +35,10 @@ steps:
3535
displayName: Detect doc-only changes
3636
condition: and(succeeded(), variables['system.pullRequest.targetBranch'])
3737

38-
#- template: linux-deps.yml
39-
40-
# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
41-
# For now, we copy/paste the steps
42-
- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
43-
displayName: 'Update apt-get lists'
44-
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
45-
46-
- script: >
47-
sudo apt-get -yq install
48-
build-essential
49-
zlib1g-dev
50-
libbz2-dev
51-
liblzma-dev
52-
libncurses5-dev
53-
libreadline6-dev
54-
libsqlite3-dev
55-
libssl-dev
56-
libgdbm-dev
57-
tk-dev
58-
lzma
59-
lzma-dev
60-
liblzma-dev
61-
libffi-dev
62-
uuid-dev
63-
xvfb
38+
- script: ./.vsts/install_deps.sh
6439
displayName: 'Install dependencies'
6540
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
6641

67-
6842
- script: ./configure --with-pydebug
6943
displayName: 'Configure CPython (debug)'
7044
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))

.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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ This is Python version 3.6.6+
99
:alt: CPython build status on Appveyor
1010
:target: https://ci.appveyor.com/project/python/cpython/branch/3.6
1111

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

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

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

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

0 commit comments

Comments
 (0)