Skip to content

Commit

Permalink
Update VSTS to Azure DevOps and simplify dependencies (GH-9168)
Browse files Browse the repository at this point in the history
  • Loading branch information
zooba committed Sep 11, 2018
1 parent ccbbdd0 commit 7f76eeb
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 122 deletions.
2 changes: 1 addition & 1 deletion .vsts/docs.yml
Expand Up @@ -4,7 +4,7 @@
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)

queue:
name: Hosted Linux Preview
name: 'Hosted Ubuntu 1604'

trigger:
branches:
Expand Down
19 changes: 19 additions & 0 deletions .vsts/install_deps.sh
@@ -0,0 +1,19 @@
sudo apt-get update

sudo apt-get -yq install \
build-essential \
zlib1g-dev \
libbz2-dev \
liblzma-dev \
libncurses5-dev \
libreadline6-dev \
libsqlite3-dev \
libssl-dev \
libgdbm-dev \
tk-dev \
lzma \
lzma-dev \
liblzma-dev \
libffi-dev \
uuid-dev \
xvfb
28 changes: 2 additions & 26 deletions .vsts/linux-buildbot.yml
Expand Up @@ -4,7 +4,7 @@
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)

queue:
name: Hosted Linux Preview
name: 'Hosted Ubuntu 1604'

trigger:
branches:
Expand All @@ -25,31 +25,7 @@ steps:
clean: true
fetchDepth: 5

#- template: linux-deps.yml

# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
# For now, we copy/paste the steps
- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
displayName: 'Update apt-get lists'

- script: >
sudo apt-get -yq install
build-essential
zlib1g-dev
libbz2-dev
liblzma-dev
libncurses5-dev
libreadline6-dev
libsqlite3-dev
libssl-dev
libgdbm-dev
tk-dev
lzma
lzma-dev
liblzma-dev
libffi-dev
uuid-dev
xvfb
- script: ./.vsts/install_deps.sh
displayName: 'Install dependencies'

- script: ./configure --with-pydebug
Expand Down
31 changes: 3 additions & 28 deletions .vsts/linux-coverage.yml
Expand Up @@ -4,7 +4,7 @@
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)

queue:
name: Hosted Linux Preview
name: 'Hosted Ubuntu 1604'

trigger:
branches:
Expand Down Expand Up @@ -35,34 +35,9 @@ steps:
displayName: Detect doc-only changes
condition: and(succeeded(), variables['system.pullRequest.targetBranch'])

#- template: linux-deps.yml

# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
# For now, we copy/paste the steps
- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
displayName: 'Update apt-get lists'
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))

- script: >
sudo apt-get -yq install
build-essential
zlib1g-dev
libbz2-dev
liblzma-dev
libncurses5-dev
libreadline6-dev
libsqlite3-dev
libssl-dev
libgdbm-dev
tk-dev
lzma
lzma-dev
liblzma-dev
libffi-dev
uuid-dev
xvfb
- script: ./.vsts/install_deps.sh
displayName: 'Install dependencies'

condition: and(succeeded(), ne(variables['DocOnly'], 'true'))

- script: ./configure --with-pydebug
displayName: 'Configure CPython (debug)'
Expand Down
31 changes: 0 additions & 31 deletions .vsts/linux-deps.yml

This file was deleted.

30 changes: 2 additions & 28 deletions .vsts/linux-pr.yml
Expand Up @@ -4,7 +4,7 @@
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)

queue:
name: Hosted Linux Preview
name: 'Hosted Ubuntu 1604'

trigger:
branches:
Expand Down Expand Up @@ -35,36 +35,10 @@ steps:
displayName: Detect doc-only changes
condition: and(succeeded(), variables['system.pullRequest.targetBranch'])

#- template: linux-deps.yml

# See https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-templates.md
# For now, we copy/paste the steps
- script: echo "deb-src http://archive.ubuntu.com/ubuntu/ xenial main" > /etc/apt/sources.list.d/python.list && sudo apt-get update
displayName: 'Update apt-get lists'
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))

- script: >
sudo apt-get -yq install
build-essential
zlib1g-dev
libbz2-dev
liblzma-dev
libncurses5-dev
libreadline6-dev
libsqlite3-dev
libssl-dev
libgdbm-dev
tk-dev
lzma
lzma-dev
liblzma-dev
libffi-dev
uuid-dev
xvfb
- script: ./.vsts/install_deps.sh
displayName: 'Install dependencies'
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))


- script: ./configure --with-pydebug
displayName: 'Configure CPython (debug)'
condition: and(succeeded(), ne(variables['DocOnly'], 'true'))
Expand Down
2 changes: 1 addition & 1 deletion .vsts/macos-buildbot.yml
Expand Up @@ -4,7 +4,7 @@
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)

queue:
name: Hosted macOS Preview
name: Hosted macOS

trigger:
branches:
Expand Down
2 changes: 1 addition & 1 deletion .vsts/macos-pr.yml
Expand Up @@ -4,7 +4,7 @@
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)

queue:
name: Hosted macOS Preview
name: Hosted macOS

trigger:
branches:
Expand Down
12 changes: 6 additions & 6 deletions README.rst
Expand Up @@ -9,17 +9,17 @@ This is Python version 3.6.6+
:alt: CPython build status on Appveyor
:target: https://ci.appveyor.com/project/python/cpython/branch/3.6

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

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

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

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

0 comments on commit 7f76eeb

Please sign in to comment.