diff options
| author | Antonin Descampe <antonin@gmail.com> | 2016-05-15 13:52:55 +0200 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2016-05-15 13:52:55 +0200 |
| commit | 517d57ef1fa636839d24fcfe8a6c1065d6bb1ce4 (patch) | |
| tree | 9d789f760fda46828c14c5d9ac39a1a080d5ab9a /tools | |
| parent | 7c41a1e393d8ac4ee16208aca83bce1f2d714a23 (diff) | |
WIP automatic deployment
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ctest_scripts/travis-ci.cmake | 10 | ||||
| -rwxr-xr-x | tools/travis-ci/run.sh | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index f8c50e5b..76a97f1c 100644 --- a/tools/ctest_scripts/travis-ci.cmake +++ b/tools/ctest_scripts/travis-ci.cmake @@ -123,6 +123,12 @@ endif() set( CTEST_SOURCE_DIRECTORY "$ENV{OPJ_SOURCE_DIR}") set( CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}") +#---------------------- +# Package parameters in case of deployment +# Might add more parameters later on +set( CPACK_GENERATOR "ZIP" ) + + #--------------------- # Files to submit to the dashboard set (CTEST_NOTES_FILES @@ -147,5 +153,9 @@ endif() if ("$ENV{OPJ_DO_SUBMIT}" STREQUAL "1") ctest_submit() endif() +# # Generate package if deployment +# if( "$ENV{OPJ_CI_DEPLOY}" STREQUAL "1") +# ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" TARGET "package") +# endif() # Do not clean, we'll parse the log for known failure #ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" ) diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh index 7c325ce1..0e77c965 100755 --- a/tools/travis-ci/run.sh +++ b/tools/travis-ci/run.sh @@ -193,7 +193,7 @@ set +x #if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ] && [ [ "${TRAVIS_TAG:-}" != "" ] || [ "${APPVEYOR_REPO_TAG:-}" == "true" ] ]; then if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ]; then OPJ_CI_DEPLOY=1 - cmake --build ${OPJ_BINARY_DIR} --target package -D CPACK_GENERATOR:STRING="ZIP" + cmake --build ${OPJ_BINARY_DIR} --target package echo "ready to deploy $(ls ${OPJ_BINARY_DIR}/openjpeg*.zip) to GitHub releases" if [ "${APPVEYOR_REPO_TAG:-}" == "true" ]; then appveyor PushArtifact "${OPJ_BINARY_DIR}/openjpeg-*.zip" |