diff --git a/.travis.yml b/.travis.yml index 39bf852..97ec8f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,14 @@ jobs: - MB_PYTHON_VERSION=3.6 - DEBUG_PRINT=1 - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - os: linux + arch: arm64 + env: + - PLAT=aarch64 + - MB_ML_VER=2014 + - MB_PYTHON_VERSION=3.7 + - DEBUG_PRINT=1 + - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - os: linux arch: arm64 env: @@ -68,7 +76,7 @@ jobs: env: - PLAT=aarch64 - MB_ML_VER=2014 - - MB_PYTHON_VERSION=3.7 + - MB_PYTHON_VERSION=3.9 - DEBUG_PRINT=1 - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e1359b5..2b393c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,7 +16,7 @@ variables: jobs: - template: azure/windows.yml parameters: - name: windows + name: windows2017 vmImage: vs2017-win2016 matrix: py_3.6_32: @@ -81,12 +81,28 @@ jobs: py_3.8_64: MB_PYTHON_VERSION: "3.8" MB_ML_VER: "2010" + py_3.9_32manylinux2010: + MB_PYTHON_VERSION: "3.9" + # Comment this out when the image grows a CPython3.9 + AZURE_PYTHON_VERSION: "3.8" + PLAT: "i686" + MB_ML_VER: "2010" + ENV_VARS_PATH: "env_vars_32.sh" + DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" + py_3.9_64manylinux2010: + MB_PYTHON_VERSION: "3.9" + # Comment this out when the image grows a CPython3.9 + AZURE_PYTHON_VERSION: "3.8" + MB_ML_VER: "2010" + DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" + # manylinux1 wheels py_3.6_32manylinux1: MB_PYTHON_VERSION: "3.6" PLAT: "i686" MB_ML_VER: "1" ENV_VARS_PATH: "env_vars_32.sh" + DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" py_3.6_64manylinux1: MB_PYTHON_VERSION: "3.6" MB_ML_VER: "1" @@ -95,6 +111,7 @@ jobs: PLAT: "i686" MB_ML_VER: "1" ENV_VARS_PATH: "env_vars_32.sh" + DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" py_3.7_64manylinux1: MB_PYTHON_VERSION: "3.7" MB_ML_VER: "1" @@ -103,6 +120,7 @@ jobs: PLAT: "i686" MB_ML_VER: "1" ENV_VARS_PATH: "env_vars_32.sh" + DOCKER_TEST_IMAGE: "multibuild/xenial_{PLAT}" py_3.8_64manylinux1: MB_PYTHON_VERSION: "3.8" MB_ML_VER: "1" diff --git a/azure/posix.yml b/azure/posix.yml index f8ee0f1..145c38e 100644 --- a/azure/posix.yml +++ b/azure/posix.yml @@ -23,10 +23,17 @@ jobs: - checkout: self submodules: true + - task: UsePythonVersion@0 + inputs: + versionSpec: $(AZURE_PYTHON_VERSION) + displayName: Set python version from AZURE + condition: ne( coalesce (variables['AZURE_PYTHON_VERSION'], 'NONE'), 'NONE') + - task: UsePythonVersion@0 inputs: versionSpec: $(MB_PYTHON_VERSION) - displayName: Set python version + displayName: Set python version from MB + condition: eq( coalesce (variables['AZURE_PYTHON_VERSION'], 'NONE'), 'NONE') - bash: | set -e