Skip to content

Commit

Permalink
force
Browse files Browse the repository at this point in the history
  • Loading branch information
abellgithub committed May 12, 2021
1 parent b7e2cea commit 25617f3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
source ../scripts/ci/conda/compile.sh
working-directory: ./pdal-feedstock

- uses: ilammy/msvc-dev-cmd@v1
- uses: ilammy/msvc-dev-cmd@v1.7.0
if: matrix.platform == 'windows-latest'
- name: Test
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/conda/examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
export BASE=`pwd`

conda activate test
conda install compilers cmake ninja -y
conda install cmake ninja -y

if [ "$PLATFORM" == "windows-latest" ]; then

Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/osx/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ echo "Configuring build type '$BUILD_TYPE'"
mkdir build

conda update -n base -c defaults conda
conda install cmake ninja compilers -y
conda install cmake ninja -y

# can remove this after CF PDAL recipe adds Draco
conda install -c conda-forge draco pkgconfig -y
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/win/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ echo "Configuring build type '$BUILD_TYPE'"
mkdir build

conda update -n base -c defaults conda
conda install -c conda-forge pkgconfig cmake ninja compilers -y
conda install -c conda-forge pkgconfig cmake ninja -y

# can remove this after CF PDAL recipe adds Draco
conda install -c conda-forge draco -y
Expand Down

0 comments on commit 25617f3

Please sign in to comment.