Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/LuxCoreRender/LuxCore
Browse files Browse the repository at this point in the history
  • Loading branch information
Dade916 committed May 22, 2020
2 parents 5c7b612 + 305c27b commit 9152edd
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,13 @@ jobs:
- script: ./scripts/azurepipeline/windows/deps-setup.cmd
displayName: Getting required deps
- bash: |
echo $PROGRAMFILES
echo "##vso[task.setvariable variable=cuda_path]$PROGRAMFILES/NVIDIA GPU Computing Toolkit/CUDA/v10.1"
echo "##vso[task.setvariable variable=cuda_path_v10_1]$PROGRAMFILES/NVIDIA GPU Computing Toolkit/CUDA/v10.1"
- template: ./scripts/azurepipeline/windows/windows_jobs.yml
parameters:
build_script: './scripts/azurepipeline/windows/build.cmd /cmake-only /no-ocl'
post_script: './scripts/azurepipeline/windows/post-build.cmd /no-ocl'
ocl_text: 'Cuda enabled'
ocl_text: 'OpenCL disabled'
minimalargs: '/target:pyluxcore,pyluxcoretools,luxcoreui'
- template: ./scripts/azurepipeline/windows/windows_jobs.yml
parameters:
Expand All @@ -112,7 +111,7 @@ jobs:
parameters:
build_script: './scripts/azurepipeline/windows/build.cmd /cmake-only /cuda'
post_script: './scripts/azurepipeline/windows/post-build.cmd /cuda'
ocl_text: 'OpenCL disabled'
ocl_text: 'CUDA enabled'
minimalargs: '/target:pyluxcore,pyluxcoretools,luxcoreui'
# - script: './scripts/azurepipeline/windows/test.cmd'
# displayName: Testing LuxCore
Expand Down

0 comments on commit 9152edd

Please sign in to comment.