Skip to content

Commit 13714ae

Browse files
committed
Use correct parameters
Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent ca3dd76 commit 13714ae

File tree

1 file changed

+21
-13
lines changed

1 file changed

+21
-13
lines changed

azure-pipelines.yml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# See also https://docs.microsoft.com/en-us/azure/devops/pipelines/scripts/cross-platform-scripting?view=azure-devops&tabs=yaml
21
trigger:
32
branches:
43
include: ['*']
@@ -10,15 +9,20 @@ pr:
109
include: ['*']
1110

1211
jobs:
12+
13+
################################################################################
14+
# These jobs are using VMs and Azure-provided Pythons
15+
################################################################################
16+
1317
- template: etc/ci/azure-posix.yml
1418
parameters:
1519
name: Ubuntu_16
1620
image_name: ubuntu-16.04
17-
matrix:
21+
matrix:
1822
Python_27_Linux:
19-
python_path: 'python2.7'
23+
python_version: '2.7'
2024
Python_36_Linux:
21-
python_path: 'python3.6'
25+
python_version: '3.6'
2226
Python_37_Linux:
2327
python_version: '3.7'
2428

@@ -28,9 +32,9 @@ jobs:
2832
image_name: macos-10.13
2933
matrix:
3034
Python_27_Mac:
31-
python_path: 'python2.7'
35+
python_version: '2.7'
3236
Python_36_Mac:
33-
python_path: 'python3.6'
37+
python_version: '3.6'
3438
Python_37_Mac:
3539
python_version: '3.7'
3640

@@ -40,9 +44,9 @@ jobs:
4044
image_name: macos-10.14
4145
matrix:
4246
Python_27_Mac:
43-
python_path: 'python2.7'
47+
python_version: '2.7'
4448
Python_36_Mac:
45-
python_path: 'python3.6'
49+
python_version: '3.6'
4650
Python_37_Mac:
4751
python_version: '3.7'
4852

@@ -52,10 +56,10 @@ jobs:
5256
image_name: vs2017-win2016
5357
matrix:
5458
Python_27_Win32:
55-
python_path: 'python2.7'
59+
python_version: '2.7'
5660
python_architecture: 'x86'
5761
Python_36_Win32:
58-
python_path: 'python3.6'
62+
python_version: '3.6'
5963
python_architecture: 'x86'
6064
Python_37_Win32:
6165
python_version: '3.7.3'
@@ -67,15 +71,20 @@ jobs:
6771
image_name: vs2017-win2016
6872
matrix:
6973
Python_27_Win64:
70-
python_path: 'python2.7'
74+
python_version: '2.7'
7175
python_architecture: 'x64'
7276
Python_36_Win64:
73-
python_path: 'python3.6'
77+
python_version: '3.6'
7478
python_architecture: 'x64'
7579
Python_37_Win64:
7680
python_version: '3.7'
7781
python_architecture: 'x64'
7882

83+
84+
################################################################################
85+
# These jobs are using containers and their own Python
86+
################################################################################
87+
7988
- template: etc/ci/azure-container-deb.yml
8089
parameters:
8190
name: Ubuntu_16_xenial_py27
@@ -209,4 +218,3 @@ jobs:
209218
python_path: '/opt/python/cp37-cp37m/bin/python'
210219
install_packages: echo "No extra packages for now"
211220
install_python: echo "Python is pre-installed"
212-

0 commit comments

Comments
 (0)