Skip to content

CI: Some Azure Pipelines cleanups #23111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,20 @@
# Adapted from https://github.com/numba/numba/blob/master/azure-pipelines.yml
jobs:
# Mac and Linux could potentially use the same template
# except it isn't clear how to use a different build matrix
# for each, so for now they are separate
- template: ci/azure/macos.yml
# Mac and Linux use the same template
- template: ci/azure/posix.yml
parameters:
name: macOS
vmImage: xcode9-macos10.13
- template: ci/azure/linux.yml
- template: ci/azure/posix.yml
parameters:
name: Linux
vmImage: ubuntu-16.04

# Windows Python 2.7 needs VC 9.0 installed, and not sure
# how to make that a conditional task, so for now these are
# separate templates as well
# Windows Python 2.7 needs VC 9.0 installed, handled in the template
- template: ci/azure/windows.yml
parameters:
name: Windows
vmImage: vs2017-win2016
- template: ci/azure/windows-py27.yml
parameters:
name: WindowsPy27
vmImage: vs2017-win2016

- job: 'Checks_and_doc'
pool:
Expand Down
79 changes: 0 additions & 79 deletions ci/azure/linux.yml

This file was deleted.

30 changes: 24 additions & 6 deletions ci/azure/macos.yml → ci/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,30 @@ jobs:
pool:
vmImage: ${{ parameters.vmImage }}
strategy:
maxParallel: 11
matrix:
py35_np_120:
ENV_FILE: ci/deps/azure-macos-35.yaml
CONDA_PY: "35"
PATTERN: "not slow and not network"
${{ if eq(parameters.name, 'macOS') }}:
py35_np_120:
ENV_FILE: ci/deps/azure-macos-35.yaml
CONDA_PY: "35"
PATTERN: "not slow and not network"

${{ if eq(parameters.name, 'Linux') }}:
py27_np_120:
ENV_FILE: ci/deps/azure-27-compat.yaml
CONDA_PY: "27"
PATTERN: "not slow and not network"

py37_locale:
ENV_FILE: ci/deps/azure-37-locale.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"
LOCALE_OVERRIDE: "zh_CN.UTF-8"

py36_locale_slow:
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
CONDA_PY: "36"
PATTERN: "not slow and not network"
LOCALE_OVERRIDE: "it_IT.UTF-8"

steps:
- script: |
Expand All @@ -39,7 +57,7 @@ jobs:
- task: PublishTestResults@2
inputs:
testResultsFiles: 'test-data-*.xml'
testRunTitle: 'MacOS-35'
testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }}
- powershell: |
$junitXml = "test-data-single.xml"
$(Get-Content $junitXml | Out-String) -match 'failures="(.*?)"'
Expand Down
58 changes: 0 additions & 58 deletions ci/azure/windows-py27.yml

This file was deleted.

14 changes: 12 additions & 2 deletions ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,28 @@ jobs:
pool:
vmImage: ${{ parameters.vmImage }}
strategy:
maxParallel: 11
matrix:
py36_np14:
ENV_FILE: ci/deps/azure-windows-36.yaml
CONDA_PY: "36"

py27_np121:
ENV_FILE: ci/deps/azure-windows-27.yaml
CONDA_PY: "27"

steps:
- task: CondaEnvironment@1
inputs:
updateConda: no
packageSpecs: ''

- powershell: |
$wc = New-Object net.webclient
$wc.Downloadfile("https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi", "VCForPython27.msi")
Start-Process "VCForPython27.msi" /qn -Wait
displayName: 'Install VC 9.0 only for Python 2.7'
condition: eq(variables.CONDA_PY, '27')
- script: |
ci\\incremental\\setup_conda_environment.cmd
displayName: 'Before Install'
Expand All @@ -33,7 +43,7 @@ jobs:
- task: PublishTestResults@2
inputs:
testResultsFiles: 'test-data.xml'
testRunTitle: 'Windows 36'
testRunTitle: 'Windows-$(CONDA_PY)'
- powershell: |
$junitXml = "test-data.xml"
$(Get-Content $junitXml | Out-String) -match 'failures="(.*?)"'
Expand Down