use azp conda

PDAL · Feb 3, 2020 · 2a71c67 · 2a71c67
1 parent a412ef9
commit 2a71c67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/scripts/azp/linux-conda.yml b/scripts/azp/linux-conda.yml
@@ -4,21 +4,14 @@ jobs:
 - job: linux_conda
   pool:
     vmImage: ubuntu-16.04
-  container:
-      image: continuumio/miniconda
-      options: --privileged
   timeoutInMinutes: 60
   steps:
+  - bash: echo "##vso[task.prependpath]$CONDA/bin"
+    displayName: Add conda to PATH
   - script: |
-      whoami
-      chown -R vsts_azpcontainer:vsts_azpcontainer /opt/conda
-      chmod -r 777 /opt/conda
-
-      . /opt/conda/etc/profile.d/conda.sh
-      source activate base
       conda create --yes --quiet --name pdal
 
-      source activate pdal
+      conda activate pdal
       conda config --set always_yes True --set show_channel_urls True
       conda config --add channels conda-forge
       conda config --set channel_priority strict
@@ -27,7 +20,7 @@ jobs:
     displayName: Install PDAL dependencies
   - script: |
       . /opt/conda/etc/profile.d/conda.sh
-      source activate pdal
+      conda activate pdal
       echo "current directory:" `pwd`
       mkdir build
       cd build
@@ -50,28 +43,28 @@ jobs:
   - script: |
       . /opt/conda/etc/profile.d/conda.sh
       cd build
-      source activate pdal
+      conda activate pdal
       ninja
     displayName: 'Build'
   - script: |
       . /opt/conda/etc/profile.d/conda.sh
       cd build
       export PDAL_DRIVER_PATH=`pwd`/lib
-      source activate pdal
+      conda activate pdal
       ctest -V
     displayName: 'Test'
   - script: |
       . /opt/conda/etc/profile.d/conda.sh
       export PDAL_TEST_DIR=`pwd`/test
       cd build
-      source activate pdal
+      conda activate pdal
       ls build/lib/*
       ninja install
     displayName: 'Install'
   - script: |
       . /opt/conda/etc/profile.d/conda.sh
       export BASE=`pwd`
-      source activate pdal
+      conda activate pdal
       for EXAMPLE in writing writing-filter writing-kernel writing-reader writing-writer
       do
           cd $BASE/examples/$EXAMPLE

diff --git a/scripts/azp/linux.yml b/scripts/azp/linux.yml
@@ -4,11 +4,10 @@ jobs:
 - job: linux
   pool:
     vmImage: ubuntu-16.04
-  container:
-      image: pdal/azp-dependencies:latest
-      options: --privileged
   timeoutInMinutes: 60
   steps:
+  - bash: echo "##vso[task.prependpath]$CONDA/bin"
+  displayName: Add conda to PATH
   - script: |
       echo "current directory:" `pwd`
       mkdir build