nightly script: Update to build Slicer 4.8 extensions first

Slicer · Oct 19, 2017 · d8507c2 · d8507c2
1 parent 14579d5
commit d8507c2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/factory-macos.sh b/factory-macos.sh
@@ -5,9 +5,9 @@ export PATH=:/usr/local/git/bin:$PATH
 # Nightly build of slicer
 /Users/kitware/Dashboards/Support/CMake-3.9.0.app/Contents/bin/ctest -S /Users/kitware/DashboardScripts/factory-macos-slicer_release_nightly.cmake -VV -O /Users/kitware/Dashboards/Logs/factory-macos-slicer_release_nightly.log
 
-# Nightly build of slicer extensions
-/Users/kitware/Dashboards/Support/CMake-3.9.0.app/Contents/bin/ctest -S /Users/kitware/DashboardScripts/factory-macos-slicerextensions_release_nightly.cmake -VV -O /Users/kitware/Dashboards/Logs/factory-macos-slicerextensions_release_nightly.log
-
 # Nightly build of slicer 4.8 extensions
 /Users/kitware/Dashboards/Support/CMake-3.9.0.app/Contents/bin/ctest -S /Users/kitware/DashboardScripts/factory-macos-slicerextensions_48_release_nightly.cmake -VV -O /Users/kitware/Dashboards/Logs/factory-macos-slicerextensions_48_release_nightly.log
 
+# Nightly build of slicer extensions
+/Users/kitware/Dashboards/Support/CMake-3.9.0.app/Contents/bin/ctest -S /Users/kitware/DashboardScripts/factory-macos-slicerextensions_release_nightly.cmake -VV -O /Users/kitware/Dashboards/Logs/factory-macos-slicerextensions_release_nightly.log
+
diff --git a/factory-south-ubuntu.sh b/factory-south-ubuntu.sh
@@ -3,9 +3,9 @@ export DISPLAY=:0.0 # just DISPLAY=:0.0 without export is not enough
 # Nightly build of slicer
 /home/kitware/Dashboards/Support/cmake-3.9.0-Linux-x86_64/bin/ctest -S /home/kitware/Dashboards/DashboardScripts/factory-south-ubuntu-slicer_release_nightly.cmake -VV -O /home/kitware/Dashboards/Logs/factory-south-ubuntu-slicer_release_nightly.log
 
-# Nightly build of slicer extensions
-/home/kitware/Dashboards/Support/cmake-3.9.0-Linux-x86_64/bin/ctest -S /home/kitware/Dashboards/DashboardScripts/factory-south-ubuntu-slicerextensions_release_nightly.cmake -VV -O /home/kitware/Dashboards/Logs/factory-south-ubuntu-slicerextensions_release_nightly.log
-
 # Nightly build of slicer 4.8 extensions
 /home/kitware/Dashboards/Support/cmake-3.9.0-Linux-x86_64/bin/ctest -S /home/kitware/Dashboards/DashboardScripts/factory-south-ubuntu-slicerextensions_48_release_nightly.cmake -VV -O /home/kitware/Dashboards/Logs/factory-south-ubuntu-slicerextensions_48_release_nightly.log
 
+# Nightly build of slicer extensions
+/home/kitware/Dashboards/Support/cmake-3.9.0-Linux-x86_64/bin/ctest -S /home/kitware/Dashboards/DashboardScripts/factory-south-ubuntu-slicerextensions_release_nightly.cmake -VV -O /home/kitware/Dashboards/Logs/factory-south-ubuntu-slicerextensions_release_nightly.log
+
diff --git a/overload.bat b/overload.bat
@@ -29,16 +29,14 @@ call :fastdel "D:\D\N\Slicer-1-build"
 :: ----------------------------------------------------------------------------
 :: Build Slicer Extensions
 :: ----------------------------------------------------------------------------
+call :fastdel "D:\D\N\S-1-E-b"
+call :fastdel "D:\D\N\S480-E-b"
 if "%IS_WEEKEND%"=="1" (
-::  call :fastdel "D:\D\N\S480-E-b"
-::  CALL :overload-vs2013-slicerextensions_48_release_nightly
-  call :fastdel "D:\D\N\S-1-E-b"
-  CALL :overload-vs2013-slicerextensions_release_nightly
+  call :overload-vs2013-slicerextensions_release_nightly
+  call :overload-vs2013-slicerextensions_48_release_nightly
 ) else (
-  call :fastdel "D:\D\N\S-1-E-b"
-  CALL :overload-vs2013-slicerextensions_release_nightly
-::  call :fastdel "D:\D\N\S480-E-b"
-::  CALL :overload-vs2013-slicerextensions_48_release_nightly
+  call :overload-vs2013-slicerextensions_48_release_nightly
+  call :overload-vs2013-slicerextensions_release_nightly
 )