another swing

PDAL · Feb 3, 2020 · 74ef5b0 · 74ef5b0
1 parent ff73ebf
commit 74ef5b0
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/scripts/azp/linux-conda.yml b/scripts/azp/linux-conda.yml
@@ -9,23 +9,19 @@ jobs:
   - bash: echo "##vso[task.prependpath]$CONDA/bin"
     displayName: Add conda to PATH
   - script: |
-
-      conda init bash
-
-    displayName: Conda init
-  - script: |
-
+      . /opt/conda/etc/profile.d/conda.sh
       conda create --yes --quiet --name pdal
 
-      conda activate pdal
+      source 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
       conda install --yes --quiet --name pdal conda-build ninja  conda-forge-ci-setup=2 -y
-      conda install --yes --quiet --name pdal -c conda-forge pdal --only-deps -y
+      conda install --yes --quiet --name pdal -c conda-forge pdal  --only-deps -y
     displayName: Install PDAL dependencies
   - script: |
-      conda activate pdal
+      . /opt/conda/etc/profile.d/conda.sh
+      source activate pdal
       echo "current directory:" `pwd`
       mkdir build
       cd build
@@ -46,26 +42,30 @@ jobs:
         ..
     displayName: 'CMake'
   - script: |
+      . /opt/conda/etc/profile.d/conda.sh
       cd build
-      conda activate pdal
+      source activate pdal
       ninja
     displayName: 'Build'
   - script: |
+      . /opt/conda/etc/profile.d/conda.sh
       cd build
       export PDAL_DRIVER_PATH=`pwd`/lib
-      conda activate pdal
+      source activate pdal
       ctest -V
     displayName: 'Test'
   - script: |
+      . /opt/conda/etc/profile.d/conda.sh
       export PDAL_TEST_DIR=`pwd`/test
       cd build
-      conda activate pdal
+      source activate pdal
       ls build/lib/*
       ninja install
     displayName: 'Install'
   - script: |
+      . /opt/conda/etc/profile.d/conda.sh
       export BASE=`pwd`
-      conda activate pdal
+      source activate pdal
       for EXAMPLE in writing writing-filter writing-kernel writing-reader writing-writer
       do
           cd $BASE/examples/$EXAMPLE