WIP automatic deployment

This commit is contained in:
Antonin Descampe 2016-05-15 13:38:32 +02:00
parent 7269c8f7a6
commit 7c41a1e393
4 changed files with 13 additions and 28 deletions

View File

@ -80,5 +80,5 @@ deploy:
on: on:
repo: uclouvain/openjpeg repo: uclouvain/openjpeg
tags: true tags: true
condition: "$OPJ_CI_DEPLOY = 1" condition: "$OPJ_CI_INCLUDE_IF_DEPLOY = 1"

View File

@ -34,6 +34,5 @@ deploy:
draft: true draft: true
prerelease: false prerelease: false
on: on:
branch: openjpeg-*
appveyor_repo_tag: true # deploy on tag push only appveyor_repo_tag: true # deploy on tag push only
OPJ_CI_DEPLOY: 1 OPJ_CI_INCLUDE_IF_DEPLOY: 1

View File

@ -123,12 +123,6 @@ endif()
set( CTEST_SOURCE_DIRECTORY "$ENV{OPJ_SOURCE_DIR}") set( CTEST_SOURCE_DIRECTORY "$ENV{OPJ_SOURCE_DIR}")
set( CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}") 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 # Files to submit to the dashboard
set (CTEST_NOTES_FILES set (CTEST_NOTES_FILES
@ -153,9 +147,5 @@ endif()
if ("$ENV{OPJ_DO_SUBMIT}" STREQUAL "1") if ("$ENV{OPJ_DO_SUBMIT}" STREQUAL "1")
ctest_submit() ctest_submit()
endif() 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 # Do not clean, we'll parse the log for known failure
#ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" ) #ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" )

View File

@ -176,14 +176,6 @@ set -x
# travis-ci doesn't dump cmake version in system info, let's print it # travis-ci doesn't dump cmake version in system info, let's print it
cmake --version cmake --version
# Check condition to deploy
#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
else
OPJ_CI_DEPLOY=0
fi
export TRAVIS_OS_NAME=${TRAVIS_OS_NAME} export TRAVIS_OS_NAME=${TRAVIS_OS_NAME}
export OPJ_SITE=${OPJ_SITE} export OPJ_SITE=${OPJ_SITE}
export OPJ_BUILDNAME=${OPJ_BUILDNAME} export OPJ_BUILDNAME=${OPJ_BUILDNAME}
@ -191,19 +183,23 @@ export OPJ_SOURCE_DIR=$(opjpath -m ${OPJ_SOURCE_DIR})
export OPJ_BINARY_DIR=$(opjpath -m ${PWD}/build) export OPJ_BINARY_DIR=$(opjpath -m ${PWD}/build)
export OPJ_BUILD_CONFIGURATION=${OPJ_CI_BUILD_CONFIGURATION} export OPJ_BUILD_CONFIGURATION=${OPJ_CI_BUILD_CONFIGURATION}
export OPJ_DO_SUBMIT=${OPJ_DO_SUBMIT} export OPJ_DO_SUBMIT=${OPJ_DO_SUBMIT}
export OPJ_CI_DEPLOY=${OPJ_CI_DEPLOY}
ctest -S ${OPJ_SOURCE_DIR}/tools/ctest_scripts/travis-ci.cmake -V || true ctest -S ${OPJ_SOURCE_DIR}/tools/ctest_scripts/travis-ci.cmake -V || true
# ctest will exit with various error codes depending on version. # ctest will exit with various error codes depending on version.
# ignore ctest exit code & parse this ourselves # ignore ctest exit code & parse this ourselves
set +x set +x
# Push Artifact in APPVEYOR case # Deployment if needed
if [ "${OPJ_CI_DEPLOY:-}" == "1" ] && [ "${APPVEYOR_REPO_TAG:-}" == "true" ]; then #if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ] && [ [ "${TRAVIS_TAG:-}" != "" ] || [ "${APPVEYOR_REPO_TAG:-}" == "true" ] ]; then
appveyor PushArtifact "openjpeg-*.zip" if [ "${OPJ_CI_INCLUDE_IF_DEPLOY:-}" == "1" ]; then
fi OPJ_CI_DEPLOY=1
if [ "${OPJ_CI_DEPLOY:-}" == "1" ]; then cmake --build ${OPJ_BINARY_DIR} --target package -D CPACK_GENERATOR:STRING="ZIP"
echo "ready to deploy $(ls openjpeg*.zip) to GitHub releases" 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"
fi
else
OPJ_CI_DEPLOY=0
fi fi
# let's parse configure/build/tests for failure # let's parse configure/build/tests for failure