Skip to content

Commit

Permalink
Revert "Build 4.5 extensions before the nightly ones."
Browse files Browse the repository at this point in the history
This reverts commit 1fbf4c4.

With the current setup, all 4.5 extensions are built every night, even
when there are no updates to 4.5 extensions index. This prevents the
nightly extension, which are more likely to change, from being built
at all.

Lacking automatic detection of the 4.5 extensions index changes and
building of the modified extensions only, it is proposed that the order
between 4.5 and nightly is changed manually on as needed basis. It is
expected that nightly builds will be changing at a faster pace than 4.5,
thus it is natural to have nightly built in the first place.

In a follow-up commit, the build script will be updated so that 4.5
are build before the nightly ones only during the weekend.

Co-authored-by: Andriy Fedorov <fedorov@bwh.harvard.edu>
  • Loading branch information
jcfr and fedorov committed Nov 26, 2015
1 parent 1fbf4c4 commit 41b143d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions factory-south-ubuntu.sh
Expand Up @@ -10,12 +10,12 @@ export DISPLAY=:0.0 # just DISPLAY=:0.0 without export is not enough
# Nightly build of slicer extensions testing
/home/kitware/Dashboards/Support/cmake-3.1.0-rc3-Linux-x86_64/bin/ctest -S /home/kitware/Dashboards/DashboardScripts/factory-south-ubuntu-64bits_slicerextensions_testing_release_nightly.cmake -VV -O /home/kitware/Dashboards/Logs/factory-south-ubuntu-64bits_slicerextensions_testing_release_nightly.log

# Nightly build of slicer 4.5 extensions
/home/kitware/Dashboards/Support/cmake-3.0.1-Linux-i386/bin/ctest -S /home/kitware/Dashboards/DashboardScripts/factory-south-ubuntu-64bits_slicerextensions_45_release_nightly.cmake -VV -O /home/kitware/Dashboards/Logs/factory-south-ubuntu-64bits_slicerextensions_45_release_nightly.log

# Nightly build of slicer extensions
/home/kitware/Dashboards/Support/cmake-3.1.0-rc3-Linux-x86_64/bin/ctest -S /home/kitware/Dashboards/DashboardScripts/factory-south-ubuntu-64bits_slicerextensions_release_nightly.cmake -VV -O /home/kitware/Dashboards/Logs/factory-south-ubuntu-64bits_slicerextensions_release_nightly.log

# Nightly build of slicer 4.5 extensions
/home/kitware/Dashboards/Support/cmake-3.0.1-Linux-i386/bin/ctest -S /home/kitware/Dashboards/DashboardScripts/factory-south-ubuntu-64bits_slicerextensions_45_release_nightly.cmake -VV -O /home/kitware/Dashboards/Logs/factory-south-ubuntu-64bits_slicerextensions_45_release_nightly.log

# Publish Slicer extension module metadata
/home/kitware/Dashboards/DashboardScripts/factory-south-ubuntu-slicer-publish-extension-module-metadata.sh > /home/kitware/Dashboards/Logs/factory-south-ubuntu-slicer-publish-extension-module-metadata.log 2>&1

Expand Down
6 changes: 3 additions & 3 deletions factory-south-win7.bat
Expand Up @@ -6,12 +6,12 @@ REM Nightly build of slicer vs2008 64bits
REM Nightly build of slicer extensions testing vs2008 64bits
"C:\D\Support\CMake 3.1.0-rc3\bin\ctest.exe" -S "C:\D\DashboardScripts\factory-south-win7-vs2008-64bits_slicerextensions_testing_release_nightly.cmake" -C Release -V -O C:\D\Logs\factory-south-win7-vs2008-64bits_slicerextensions_testing_release_nightly.txt

REM Nightly build of slicer 4.5 extensions vs2008 64bits
"C:\D\Support\CMake 3.0.1\bin\ctest.exe" -S "C:\D\DashboardScripts\factory-south-win7-vs2008-64bits_slicerextensions_45_release_nightly.cmake" -C Release -V -O C:\D\Logs\factory-south-win7-vs2008-64bits_slicerextensions_45_release_nightly.txt

REM Nightly build of slicer extensions vs2008 64bits
"C:\D\Support\CMake 3.1.0-rc3\bin\ctest.exe" -S "C:\D\DashboardScripts\factory-south-win7-vs2008-64bits_slicerextensions_release_nightly.cmake" -C Release -V -O C:\D\Logs\factory-south-win7-vs2008-64bits_slicerextensions_release_nightly.txt

REM Nightly build of slicer 4.5 extensions vs2008 64bits
"C:\D\Support\CMake 3.0.1\bin\ctest.exe" -S "C:\D\DashboardScripts\factory-south-win7-vs2008-64bits_slicerextensions_45_release_nightly.cmake" -C Release -V -O C:\D\Logs\factory-south-win7-vs2008-64bits_slicerextensions_45_release_nightly.txt

:: Publish Slicer extension module metadata
::call C:\D\DashboardScripts\factory-south-win7-slicer-publish-extension-module-metadata.bat >C:\D\Logs\factory-south-win7-slicer-publish-extension-module-metadata.log 2>&1

Expand Down
6 changes: 3 additions & 3 deletions factory.sh
Expand Up @@ -8,12 +8,12 @@ export PATH=:/usr/local/git/bin:$PATH
# Nightly build of slicer extensions testing
/Users/kitware/Dashboards/Support/CMake\ 3.0.1.app/Contents/bin/ctest -S /Users/kitware/DashboardScripts/factory-64bits_slicerextensions_testing_release_nightly.cmake -VV -O /Users/kitware/Dashboards/Logs/factory-64bits_slicerextensions_testing_release_nightly.log

# Nightly build of slicer 4.5 extensions
/Users/kitware/Dashboards/Support/CMake\ 3.0.1.app/Contents/bin/ctest -S /Users/kitware/DashboardScripts/factory-64bits_slicerextensions_45_release_nightly.cmake -VV -O /Users/kitware/Dashboards/Logs/factory-64bits_slicerextensions_45_release_nightly.log

# Nightly build of slicer extensions
/Users/kitware/Dashboards/Support/CMake\ 3.0.1.app/Contents/bin/ctest -S /Users/kitware/DashboardScripts/factory-64bits_slicerextensions_release_nightly.cmake -VV -O /Users/kitware/Dashboards/Logs/factory-64bits_slicerextensions_release_nightly.log

# Nightly build of slicer 4.5 extensions
/Users/kitware/Dashboards/Support/CMake\ 3.0.1.app/Contents/bin/ctest -S /Users/kitware/DashboardScripts/factory-64bits_slicerextensions_45_release_nightly.cmake -VV -O /Users/kitware/Dashboards/Logs/factory-64bits_slicerextensions_45_release_nightly.log

# Publish Slicer extension module metadata
/Users/kitware/DashboardScripts/factory-slicer-publish-extension-module-metadata.sh > /Users/kitware/Dashboards/Logs/factory-slicer-publish-extension-module-metadata.log 2>&1

Expand Down

0 comments on commit 41b143d

Please sign in to comment.