Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Commit ce775a4

Browse files
committed
try to get conditional to work 10
1 parent 9082c52 commit ce775a4

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

azure-pipelines.yml

+2-19
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,6 @@ jobs:
4949
PYTHON_ARCH: 'x64'
5050
BITS: 64
5151

52-
- template: azure/windows.yml
53-
parameters:
54-
name: windows2019
55-
vmImage: windows-2019
56-
matrix:
57-
py_3.9_32:
58-
# Will use the latest up to 3.9.0
59-
PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'"
60-
PYTHON_ARCH: "x86"
61-
BITS: 32
62-
py_3.9_64:
63-
# Will use the latest up to 3.9.0
64-
PYTHON_VERSION: "'3.9.0-alpha - 3.9.0'"
65-
PYTHON_ARCH: 'x64'
66-
BITS: 64
67-
68-
6952
- template: azure/posix.yml
7053
parameters:
7154
name: linux
@@ -100,12 +83,14 @@ jobs:
10083
MB_ML_VER: "2010"
10184
py_3.9_32manylinux2010:
10285
MB_PYTHON_VERSION: "3.9"
86+
# Comment this out when the image grows a CPython3.9
10387
AZURE_PYTHON_VERSION: "3.8"
10488
PLAT: "i686"
10589
MB_ML_VER: "2010"
10690
ENV_VARS_PATH: "env_vars_32.sh"
10791
py_3.9_64manylinux2010:
10892
MB_PYTHON_VERSION: "3.9"
93+
# Comment this out when the image grows a CPython3.9
10994
AZURE_PYTHON_VERSION: "3.8"
11095
MB_ML_VER: "2010"
11196

@@ -146,5 +131,3 @@ jobs:
146131
MB_PYTHON_VERSION: "3.7"
147132
py_3.8_64:
148133
MB_PYTHON_VERSION: "3.8"
149-
py_3.9_64:
150-
MB_PYTHON_VERSION: "3.9"

azure/posix.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,15 @@ jobs:
2525

2626
- task: UsePythonVersion@0
2727
inputs:
28-
versionSpec: ${{ coalesce(variables.AZURE_PYTHON_VERSION, variables.MB_PYTHON_VERSION) }}
29-
displayName: Set python version
28+
versionSpec: $(AZURE_PYTHON_VERSION)
29+
displayName: Set python version from AZURE
30+
condition: ne( coalesce (variables['AZURE_PYTHON_VERSION'], 'NONE'), 'NONE')
31+
32+
- task: UsePythonVersion@0
33+
inputs:
34+
versionSpec: $(MB_PYTHON_VERSION)
35+
displayName: Set python version from MB
36+
condition: eq( coalesce (variables['AZURE_PYTHON_VERSION'], 'NONE'), 'NONE')
3037

3138
- bash: |
3239
set -e

0 commit comments

Comments
 (0)