CI: reenable more builds

cctbx · Nov 20, 2019 · 03c96ad · 03c96ad
1 parent d44f7bb
commit 03c96ad
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 53 deletions.
diff --git a/.azure-pipelines/azure-pipelines-nightly.yml b/.azure-pipelines/azure-pipelines-nightly.yml
@@ -31,30 +31,30 @@ stages:
   dependsOn: Preparation
   jobs:
     - template: ./conda-win.yml
-    # - template: ./conda-linux.yml
-    #   parameters:
-    #     distribution: centos
-    #     version: [6, 10]
-    # - template: ./conda-linux.yml
-    #   parameters:
-    #     distribution: centos
-    #     version: [7, 6, 1810]
-    # - template: ./conda-linux.yml
-    #   parameters:
-    #     distribution: centos
-    #     version: [8]
-    # - template: ./conda-linux.yml
-    #   parameters:
-    #     distribution: ubuntu
-    #     version: ['18', '04']
-    # - template: ./conda-linux.yml
-    #   parameters:
-    #     distribution: ubuntu
-    #     version: ['16', '04']
-    # - template: ./conda-linux.yml
-    #   parameters:
-    #     distribution: ubuntu
-    #     version: ['14', '04']
+    - template: ./conda-linux.yml
+      parameters:
+        distribution: centos
+        version: [6, 10]
+    - template: ./conda-linux.yml
+      parameters:
+        distribution: centos
+        version: [7, 6, 1810]
+    - template: ./conda-linux.yml
+      parameters:
+        distribution: centos
+        version: [8]
+    - template: ./conda-linux.yml
+      parameters:
+        distribution: ubuntu
+        version: ['18', '04']
+    - template: ./conda-linux.yml
+      parameters:
+        distribution: ubuntu
+        version: ['16', '04']
+    - template: ./conda-linux.yml
+      parameters:
+        distribution: ubuntu
+        version: ['14', '04']
     - template: ./conda-osx.yml
       parameters:
         vmImage: [10, 14]

diff --git a/.azure-pipelines/base-linux.yml b/.azure-pipelines/base-linux.yml
@@ -8,7 +8,7 @@ jobs:
     vmImage: ubuntu-16.04
   timeoutInMinutes: 360
   strategy:
-    maxParallel: 3
+    maxParallel: 1
     matrix:
       python2.7:
         CONDA: Linux

diff --git a/.azure-pipelines/base-osx.yml b/.azure-pipelines/base-osx.yml
@@ -9,7 +9,7 @@ jobs:
     vmImage: ${{ format('macOS-{0}', join('.', parameters.vmImage)) }}
   timeoutInMinutes: 360
   strategy:
-    maxParallel: 3
+    maxParallel: 1
     matrix:
       python2.7:
         CONDA: MacOSX

diff --git a/.azure-pipelines/base-win.yml b/.azure-pipelines/base-win.yml
@@ -8,7 +8,7 @@ jobs:
     vmImage: vs2017-win2016
   timeoutInMinutes: 360
   strategy:
-    maxParallel: 3
+    maxParallel: 1
     matrix:
       python2.7:
         OS: win-64

diff --git a/.azure-pipelines/conda-linux.yml b/.azure-pipelines/conda-linux.yml
@@ -8,7 +8,7 @@ jobs:
     vmImage: ubuntu-16.04
   timeoutInMinutes: 360
   strategy:
-    maxParallel: 3
+    maxParallel: 2
     matrix:
       python2.7:
         CONDA: Linux
@@ -22,6 +22,11 @@ jobs:
         CONDA: Linux
         OS: linux-64
         PYTHON_VERSION: py37
+      python3.8:
+        CONDA: Linux
+        OS: linux-64
+        PYTHON_VERSION: py38
+
   container:
     image: ${{ parameters.distribution }}:${{ join('.', parameters.version) }}
     options: "--name ci-container -v /usr/bin/docker:/tmp/docker:ro"

diff --git a/.azure-pipelines/conda-osx.yml b/.azure-pipelines/conda-osx.yml
@@ -9,7 +9,7 @@ jobs:
     vmImage: ${{ format('macOS-{0}', join('.', parameters.vmImage)) }}
   timeoutInMinutes: 360
   strategy:
-    maxParallel: 3
+    maxParallel: 2
     matrix:
       python2.7:
         CONDA: MacOSX
@@ -23,6 +23,10 @@ jobs:
         CONDA: MacOSX
         OS: osx-64
         PYTHON_VERSION: py37
+      python3.8:
+        CONDA: MacOSX
+        OS: osx-64
+        PYTHON_VERSION: py38
 
   steps:
   - script: |

diff --git a/.azure-pipelines/conda-win.yml b/.azure-pipelines/conda-win.yml
@@ -8,7 +8,7 @@ jobs:
     vmImage: vs2017-win2016
   timeoutInMinutes: 360
   strategy:
-    maxParallel: 3
+    maxParallel: 2
     matrix:
       python2.7:
         OS: win-64
@@ -19,6 +19,9 @@ jobs:
       python3.7:
         OS: win-64
         PYTHON_VERSION: py37
+      python3.8:
+        OS: win-64
+        PYTHON_VERSION: py38
 
   steps:
   # install compilers
@@ -81,26 +84,26 @@ jobs:
       call %CONDA%\condabin\conda.bat install -y -n base conda=4.7
     displayName: Update conda
 
-  # - task: DownloadPipelineArtifact@2
-  #   displayName: Download conda packages
-  #   inputs:
-  #     source: 'current'
-  #     artifact: $(PYTHON_VERSION)_$(OS)
-  #     path: $(Pipeline.Workspace)/channel
-
-  # - script: |
-  #     call %CONDA%\condabin\conda.bat install -y conda-build
-  #     cd $(Pipeline.Workspace)\channel
-  #     more filenames.txt
-  #     call %CONDA%\condabin\conda.bat index .
-  #     echo @EXPLICIT > env.txt
-  #     for /f "tokens=*" %%f in (filenames.txt) do echo file:///$(Pipeline.Workspace)\channel\%%f >> env.txt
-  #     more env.txt
-  #   displayName: Build local channel
+  - task: DownloadPipelineArtifact@2
+    displayName: Download conda packages
+    inputs:
+      source: 'current'
+      artifact: $(PYTHON_VERSION)_$(OS)
+      path: $(Pipeline.Workspace)/channel
+
+  - script: |
+      call %CONDA%\condabin\conda.bat install -y conda-build
+      cd $(Pipeline.Workspace)\channel
+      more filenames.txt
+      call %CONDA%\condabin\conda.bat index .
+      echo @EXPLICIT > env.txt
+      for /f "tokens=*" %%f in (filenames.txt) do echo file:///$(Pipeline.Workspace)\channel\%%f >> env.txt
+      more env.txt
+    displayName: Build local channel
 
   - script: |
-      #call %CONDA%\condabin\conda.bat create -y --offline -n $(PYTHON_VERSION) --file $(Pipeline.Workspace)\channel\env.txt
-      call %CONDA%\condabin\conda.bat create -y -n $(PYTHON_VERSION) --file $(Pipeline.Workspace)\modules\cctbx_project\libtbx\auto_build\conda_envs\cctbx_%PYTHON_VERSION%_%OS%.txt
+      call %CONDA%\condabin\conda.bat create -y --offline -n $(PYTHON_VERSION) --file $(Pipeline.Workspace)\channel\env.txt
+      # call %CONDA%\condabin\conda.bat create -y -n $(PYTHON_VERSION) --file $(Pipeline.Workspace)\modules\cctbx_project\libtbx\auto_build\conda_envs\cctbx_%PYTHON_VERSION%_%OS%.txt
       call %CONDA%\condabin\conda.bat install -y -c conda-forge --no-deps -n $(PYTHON_VERSION) junit-xml
     displayName: Create conda environment
 

diff --git a/.azure-pipelines/download-conda.yml b/.azure-pipelines/download-conda.yml
@@ -4,7 +4,7 @@
 #
 # Variables:
 #   OS: linux-64, osx-64, win-64
-#   PYTHON_VERSION: py27, py36
+#   PYTHON_VERSION: py27, py36, py37, py38
 
 jobs:
 - job: conda_packages
@@ -23,6 +23,9 @@ jobs:
       linux_py37:
         OS: linux-64
         PYTHON_VERSION: py37
+      linux_py38:
+        OS: linux-64
+        PYTHON_VERSION: py38
       macos_py27:
         OS: osx-64
         PYTHON_VERSION: py27
@@ -32,12 +35,21 @@ jobs:
       macos_py37:
         OS: osx-64
         PYTHON_VERSION: py37
+      macos_py38:
+        OS: osx-64
+        PYTHON_VERSION: py38
       win_py27:
         OS: win-64
         PYTHON_VERSION: py27
-      # win_py36:
-      #   OS: win-64
-      #   PYTHON_VERSION: py36
+      win_py36:
+        OS: win-64
+        PYTHON_VERSION: py36
+      win_py37:
+        OS: win-64
+        PYTHON_VERSION: py37
+      win_py38:
+        OS: win-64
+        PYTHON_VERSION: py38
 
   steps:
 

diff --git a/.azure-pipelines/syntax.yml b/.azure-pipelines/syntax.yml
@@ -12,6 +12,11 @@ jobs:
         PYTHON_VERSION: 2.7
       python3.6:
         PYTHON_VERSION: 3.6
+      python3.7:
+        PYTHON_VERSION: 3.7
+      python3.8:
+        PYTHON_VERSION: 3.8
+
 
   steps:
 

diff --git a/.azure-pipelines/unix-conda-build.yml b/.azure-pipelines/unix-conda-build.yml
@@ -3,7 +3,7 @@
 # Variables:
 #   CONDA: Linux, MacOSX
 #   OS: linux-64, osx-64
-#   PYTHON_VERSION: py27, py36, py37
+#   PYTHON_VERSION: py27, py36, py37, py38
 #
 # Optional Parameters:
 #   distribution: centos, ubuntu