Skip to content

Commit c8e4f8f

Browse files
committed
Merge pull request #448 from cchampet/travis_fixDeployBinaries
Travis: fix binaries from deploy service
2 parents 5f8ce57 + bac00f1 commit c8e4f8f

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ env:
2020
- DEPENDENCIES_INSTALL=${TRAVIS_BUILD_DIR}/install-dependencies
2121
- TUTTLE_BUILD=${TRAVIS_BUILD_DIR}/build-tuttle
2222
- TUTTLE_INSTALL=${TRAVIS_BUILD_DIR}/install-tuttle
23+
- TUTTLE_DEPLOY=tuttle-${_system_name}-${_system_version}-${_system_arch}
2324
- CI_NODE_TOTAL=2
2425

2526
matrix:
@@ -117,15 +118,13 @@ addons:
117118
branch_pattern: coverity_scan
118119

119120
before_deploy:
120-
# create archive
121-
- cd ${TRAVIS_BUILD_DIR}
122-
- tar -cvzf tuttle-${TRAVIS_OS_NAME}-${CC}.tgz ${TUTTLE_INSTALL}
121+
- tools/travis/deploy.sh
123122

124123
deploy:
125124
provider: releases
126125
api_key:
127126
secure: ${GITHUB_RELEASE_API_KEY}
128-
file: tuttle-${TRAVIS_OS_NAME}-${CC}.tgz
127+
file: ${TUTTLE_DEPLOY}-${CC}.tgz
129128
skip_cleanup: true
130129
on:
131130
branch: master

tools/travis/deploy.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
# Exit immediately if a command exits with a non-zero status
4+
set -e
5+
# Print commands and their arguments as they are executed.
6+
set -x
7+
8+
if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
9+
# Fix additionnal dependencies of boost-regex
10+
cp /usr/lib/libicuuc.so.48 ${TUTTLE_INSTALL}/lib
11+
cp /usr/lib/libicui18n.so.48 ${TUTTLE_INSTALL}/lib
12+
fi
13+
14+
# Create archive
15+
cd ${TRAVIS_BUILD_DIR}
16+
tar -czf ${TUTTLE_DEPLOY}-${CC}.tgz install-tuttle

0 commit comments

Comments
 (0)