From 7f76eebf407c5caf8564ec3244ed7409b828974d Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 11 Sep 2018 14:01:19 -0700 Subject: Update VSTS to Azure DevOps and simplify dependencies (GH-9168) --- .vsts/docs.yml | 2 +- .vsts/install_deps.sh | 19 +++++++++++++++++++ .vsts/linux-buildbot.yml | 28 ++-------------------------- .vsts/linux-coverage.yml | 31 +++---------------------------- .vsts/linux-deps.yml | 31 ------------------------------- .vsts/linux-pr.yml | 30 ++---------------------------- .vsts/macos-buildbot.yml | 2 +- .vsts/macos-pr.yml | 2 +- README.rst | 12 ++++++------ 9 files changed, 35 insertions(+), 122 deletions(-) create mode 100755 .vsts/install_deps.sh delete mode 100644 .vsts/linux-deps.yml diff --git a/.vsts/docs.yml b/.vsts/docs.yml index 93a7282..0be07b3 100644 --- a/.vsts/docs.yml +++ b/.vsts/docs.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: Hosted Linux Preview + name: 'Hosted Ubuntu 1604' trigger: branches: diff --git a/.vsts/install_deps.sh b/.vsts/install_deps.sh new file mode 100755 index 0000000..7b98cfd --- /dev/null +++ b/.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 diff --git a/.vsts/linux-buildbot.yml b/.vsts/linux-buildbot.yml index 4c01bdd..09084e0 100644 --- a/.vsts/linux-buildbot.yml +++ b/.vsts/linux-buildbot.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: Hosted Linux Preview + name: 'Hosted Ubuntu 1604' trigger: branches: @@ -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 diff --git a/.vsts/linux-coverage.yml b/.vsts/linux-coverage.yml index 62fafe3..4eb75ef 100644 --- a/.vsts/linux-coverage.yml +++ b/.vsts/linux-coverage.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: Hosted Linux Preview + name: 'Hosted Ubuntu 1604' trigger: branches: @@ -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)' diff --git a/.vsts/linux-deps.yml b/.vsts/linux-deps.yml deleted file mode 100644 index d1922a7..0000000 --- a/.vsts/linux-deps.yml +++ /dev/null @@ -1,31 +0,0 @@ -# Note: this file is not currently used, but when template support comes to VSTS it -# will be referenced from the other scripts.. - -# Current docs for the syntax of this file are at: -# https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted.md - -#parameters: - -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 - displayName: 'Install dependencies' diff --git a/.vsts/linux-pr.yml b/.vsts/linux-pr.yml index 922fa81..945ac09 100644 --- a/.vsts/linux-pr.yml +++ b/.vsts/linux-pr.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: Hosted Linux Preview + name: 'Hosted Ubuntu 1604' trigger: branches: @@ -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')) diff --git a/.vsts/macos-buildbot.yml b/.vsts/macos-buildbot.yml index d9b2297..f58ea16 100644 --- a/.vsts/macos-buildbot.yml +++ b/.vsts/macos-buildbot.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: Hosted macOS Preview + name: Hosted macOS trigger: branches: diff --git a/.vsts/macos-pr.yml b/.vsts/macos-pr.yml index a3fd448..c56e66b 100644 --- a/.vsts/macos-pr.yml +++ b/.vsts/macos-pr.yml @@ -4,7 +4,7 @@ name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr) queue: - name: Hosted macOS Preview + name: Hosted macOS trigger: branches: diff --git a/README.rst b/README.rst index c9b518b..a2c76ac 100644 --- a/README.rst +++ b/README.rst @@ -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 -- cgit v0.12