Merge pull request #42 from klauer/deploy

MNT: updates from plcprog-console
pcdshub · Jul 25, 2023 · 5ee7124 · 5ee7124
2 parents 2b7eb1a + 0b9e7b0
commit 5ee7124
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ads_deploy/windows/build_ioc.cmd b/ads_deploy/windows/build_ioc.cmd
@@ -12,7 +12,7 @@ IF %AdsDeployUseDocker% EQU 1 (
     @echo - Attempting to build the IOC
     %RunDocker% %DockerImage% "find '%IocMountPath%/iocBoot' -type d -maxdepth 1 -name 'ioc*' -exec make -C {} \;"
 ) ELSE (
-    bash --login -c "find '%SolutionDir:\=/%/iocBoot' -type d -maxdepth 1 -name 'ioc*' -exec bash --login %AdsDeployWindowsScripts:\=/%/build.sh '{}' '%WINDOWS_ADS_IOC_TOP:\=/%/' \;"
+    C:\miniconda\envs\ads-deploy-2.9.1\Library\usr\bin\bash.exe --login -c "find '%SolutionDir:\=/%/iocBoot' -type d -maxdepth 1 -name 'ioc*' -exec bash --login %AdsDeployWindowsScripts:\=/%/build.sh '{}' '%WINDOWS_ADS_IOC_TOP:\=/%/' \;"
 )
 
 if %ERRORLEVEL% NEQ 0 (

diff --git a/ads_deploy/windows/conda_config.cmd b/ads_deploy/windows/conda_config.cmd
@@ -1,5 +1,5 @@
 SET ADS_DEPLOY_CONDA_ENV=ads-deploy-2.9.1
-SET WINDOWS_ADS_IOC_TOP=c:/Repos/ads-ioc/R0.4.1
+SET WINDOWS_ADS_IOC_TOP=c:/Repos/ads-ioc/R0.6.1
 
 IF "%UseDocker%" == "0" (
     echo * Using ads-deploy conda environment: %ADS_DEPLOY_CONDA_ENV%

diff --git a/ads_deploy/windows/select_conda_or_docker.cmd b/ads_deploy/windows/select_conda_or_docker.cmd
@@ -1 +1 @@
-SET AdsDeployUseDocker=0
+SET AdsDeployUseDocker=0