From e82c985f7a552d18f1e577ba08600652c1f50cf2 Mon Sep 17 00:00:00 2001 From: waltje Date: Sun, 28 Apr 2019 03:27:58 -0500 Subject: [PATCH] Updated Travis control files to allow for log builds. --- .travis-build.sh | 7 ++++--- .travis-deploy.sh | 10 ++++++---- .travis.yml | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.travis-build.sh b/.travis-build.sh index 2c3029f..0ad635c 100644 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -9,7 +9,7 @@ # # Build script for the Travis CI remote builder service. # -# Version: @(#).travis-build.sh 1.0.5 2019/03/10 +# Version: @(#).travis-build.sh 1.0.6 2019/04/27 # # Author: Fred N. van Kempen, # @@ -45,11 +45,12 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - [ "x${DEBUG}" = "xy" ] && TARGET=debug if [ "x${DEV_BUILD}" = "xy" ]; then TARGET="win-${TRAVIS_BUILD_NUMBER}_dev-x86" elif [ "x${DEBUG}" = "xy" ]; then - TARGET="win-${TRAVIS_BUILD_NUMBER}_debug-x86" + TARGET="win-${TRAVIS_BUILD_NUMBER}_dbg-x86" + elif [ "x${LOGGING}" = "xy" ]; then + TARGET="win-${TRAVIS_BUILD_NUMBER}_log-x86" else TARGET="win-${TRAVIS_BUILD_NUMBER}-x86" fi diff --git a/.travis-deploy.sh b/.travis-deploy.sh index a1af546..6f3278d 100644 --- a/.travis-deploy.sh +++ b/.travis-deploy.sh @@ -9,7 +9,7 @@ # # Deployment script for the Travis CI remote builder service. # -# Version: @(#).travis-deploy.sh 1.0.3 2019/03/10 +# Version: @(#).travis-deploy.sh 1.0.4 2019/04/27 # # Author: Fred N. van Kempen, # @@ -48,13 +48,15 @@ # Ignore the cron builds. [ "x${TRAVIS_EVENT_TYPE}" = "xcron" ] && exit 0 - [ "x${DEBUG}" = "xy" ] && TARGET=debug if [ "x${DEV_BUILD}" = "xy" ]; then TARGET="win-${TRAVIS_BUILD_NUMBER}_dev-x86" BTYPE=dev elif [ "x${DEBUG}" = "xy" ]; then - TARGET="win-${TRAVIS_BUILD_NUMBER}_debug-x86" + TARGET="win-${TRAVIS_BUILD_NUMBER}_dbg-x86" BTYPE=debug + elif [ "x${LOGGING}" = "xy" ]; then + TARGET="win-${TRAVIS_BUILD_NUMBER}_log-x86" + BTYPE=logging else TARGET="win-${TRAVIS_BUILD_NUMBER}-x86" BTYPE=regular @@ -75,7 +77,7 @@ -F "type=${BTYPE}" \ -F "build=${TRAVIS_BUILD_NUMBER}" \ -F "id=${COMMIT}" \ - -F "notes=not available" \ + -F "notes=GIT #${COMMIT}" \ -F "file_name=@${TARGET}.zip" \ ${SITE_URL} diff --git a/.travis.yml b/.travis.yml index 29e3fa4..e614a79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ # # Project file for the Travis CI remote builder service. # -# Version: @(#).travis.yml 1.0.14 2019/04/21 +# Version: @(#).travis.yml 1.0.15 2019/04/27 # # Authors: Natalia Portillo, # Fred N. van Kempen, @@ -57,6 +57,7 @@ env: matrix: - PROG=VARCem CROSS=y DEBUG=n + - PROG=VARCem CROSS=y DEBUG=n LOGGING=y - PROG=VARCem CROSS=y DEBUG=y - PROG=VARCem_dev CROSS=y DEBUG=y DEV_BUILD=y