Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detect build image and pick dashboard script based on that #283

Merged
merged 1 commit into from
Oct 13, 2017
Merged

Detect build image and pick dashboard script based on that #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,24 @@ before_build:
$env:BUILD_NAME_BRANCH = $env:APPVEYOR_REPO_BRANCH
}
$env:CUSTOM_BUILD_NAME = ("{0}_{1}_vs{2}" -f $env:BUILD_NAME_BRANCH, $env:APPVEYOR_BUILD_NUMBER, $env:APPVEYOR_BUILD_WORKER_IMAGE.split()[2] )
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
$env:DASHBOARD_SCRIPT_SUFFIX = ($ENV:APPVEYOR_BUILD_WORKER_IMAGE -replace '\s', '-').ToLower()
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_%DASHBOARD_SCRIPT_SUFFIX%.cmake
-Ddashboard_full=OFF
-Ddashboard_do_update=true
-DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%

build_script:
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_%DASHBOARD_SCRIPT_SUFFIX%.cmake
-Ddashboard_full=OFF
-Ddashboard_do_configure=true
-DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_%DASHBOARD_SCRIPT_SUFFIX%.cmake
-Ddashboard_full=OFF
-Ddashboard_do_build=true
-DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%

test_script:
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_default.cmake
- ctest.exe -VV -S ../adios2/scripts\appveyor\av_%DASHBOARD_SCRIPT_SUFFIX%.cmake
-Ddashboard_full=OFF
-Ddashboard_do_test=true
-DCTEST_BUILD_NAME=%CUSTOM_BUILD_NAME%
Expand Down
2 changes: 1 addition & 1 deletion scripts/appveyor/av_default.cmake → scripts/appveyor/av_visual-studio-2015.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)

message("av_default.cmake, CTEST_BUILD_NAME=${CTEST_BUILD_NAME}, push build notes is ADIOS_CTEST_SUBMIT_NOTES=${ADIOS_CTEST_SUBMIT_NOTES}")
message("av_visual-studio-2015.cmake, CTEST_BUILD_NAME=${CTEST_BUILD_NAME}, push build notes is ADIOS_CTEST_SUBMIT_NOTES=${ADIOS_CTEST_SUBMIT_NOTES}")

set(dashboard_model Experimental)
set(dashboard_binary_name "build_visual-studio")
Expand Down
30 changes: 30 additions & 0 deletions scripts/appveyor/av_visual-studio-2017.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Client maintainer: chuck.atkins@kitware.com
set(CTEST_SITE "AppVeyor")
set(CTEST_BUILD_CONFIGURATION Release)
set(CTEST_CMAKE_GENERATOR "Visual Studio 15 2017 Win64")
set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)

message("av_visual-studio-2017.cmake, CTEST_BUILD_NAME=${CTEST_BUILD_NAME}, push build notes is ADIOS_CTEST_SUBMIT_NOTES=${ADIOS_CTEST_SUBMIT_NOTES}")

set(dashboard_model Experimental)
set(dashboard_binary_name "build_visual-studio")
set(dashboard_track "Continuous Integration")

set(CTEST_GIT_COMMAND "git.exe")
set(CTEST_UPDATE_VERSION_ONLY TRUE)
set(CTEST_SOURCE_DIRECTORY "$ENV{APPVEYOR_BUILD_FOLDER}")
set(CTEST_DASHBOARD_ROOT "C:/projects/adios2build")

set(dashboard_cache "
ADIOS2_USE_ADIOS1:STRING=OFF
ADIOS2_USE_BZip2:STRING=OFF
ADIOS2_USE_DataMan:STRING=OFF
ADIOS2_USE_Fortran:STRING=OFF
ADIOS2_USE_HDF5:STRING=OFF
ADIOS2_USE_MPI:STRING=OFF
ADIOS2_USE_Python:STRING=OFF
ADIOS2_USE_ZFP:STRING=OFF
ADIOS2_USE_ZeroMQ:STRING=OFF
")

include(${CMAKE_CURRENT_LIST_DIR}/../dashboard/adios_common.cmake)