Skip to content

Commit 37215c9

Browse files
Merge pull request #112 from branan/add_dynamic_tarball
(maint) Build dynamic artifact for travis
2 parents b05028a + 8a432a7 commit 37215c9

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,32 @@ before_install:
88
script:
99
- >
1010
docker run -v `pwd`:/cpp-hocon gcr.io/cpp-projects/cpp-ci:1 /bin/bash -c "
11-
wget https://github.com/puppetlabs/leatherman/releases/download/${LEATHERMAN_VERSION}/leatherman.tar.gz &&
12-
tar xzvf leatherman.tar.gz --strip 1 -C / &&
11+
wget https://github.com/puppetlabs/leatherman/releases/download/${LEATHERMAN_VERSION}/leatherman${PKG_SUFFIX}.tar.gz &&
12+
tar xzvf leatherman${PKG_SUFFIX}.tar.gz --strip 1 -C / &&
1313
cd /cpp-hocon &&
1414
cmake $EXTRA_VARS . &&
1515
mkdir dest &&
1616
make $TARGET DESTDIR=/cpp-hocon/dest VERBOSE=1 -j2 &&
1717
{ [[ '$COVERALLS' != 'ON' ]] || coveralls --gcov-options '\-lp' -r . -b . -e src -e vendor >/dev/null || true; }
1818
"
19-
- if [[ $DO_RELEASE = true ]]; then tar czvf cpp-hocon.tar.gz `find dest -type f -print`; fi
19+
- if [[ $DO_RELEASE = true ]]; then tar czvf cpp-hocon${PKG_SUFFIX}.tar.gz `find dest -type f -print`; fi
2020

2121
env:
2222
global:
23-
- LEATHERMAN_VERSION=1.4.0
23+
- LEATHERMAN_VERSION=1.5.2
2424
matrix:
2525
- TARGET=cpplint
2626
- TARGET=cppcheck
27-
- TARGET="all test install ARGS=-V" DO_RELEASE=true EXTRA_VARS="-DBOOST_STATIC=ON"
27+
- TARGET="all test install ARGS=-V" DO_RELEASE=true PKG_SUFFIX="" EXTRA_VARS="-DBOOST_STATIC=ON"
28+
- TARGET="all test install ARGS=-V" DO_RELEASE=true PKG_SUFFIX="-dynamic" EXTRA_VARS=""
2829
- TARGET="all test install ARGS=-V" EXTRA_VARS="-DBOOST_STATIC=ON -DCMAKE_BUILD_TYPE=Debug -DCOVERALLS=ON" COVERALLS=ON
2930

3031
deploy:
3132
provider: releases
3233
api_key:
3334
secure: CpEaVGNtPPKb55xvohWoyAQ0IBFzatEcjnFq9zT3HTWAi8Or4wH9RTBdO6HJ64NOzUiLlR7HV7CEu0FnRqHGK3r61sc3rp9aVrmw/psHHhY5AhmrmWT304K1b6bepOOR/8y2JtDlsvY0ya1H954yFMyQ8iG11hemPwzJsJbMjxYtYXXFCsAVILPUIb9xC6vcMYgyYssfUXta73KyLdbIFS25nUq/fGX3MBXzf3PHpDcnbBrMm7aMy9tSAFrl7YDCFKWbkNczlf5v6zJIXgmjuix6Clac4DabJHufe/UHrqXtORbmuvYSOpxY4uGHi7sINfj53JsTx2pM3GCITMUVafMOyEKHYiHyIODxMs8Ey3KQLgzw8MxSZ5HaeWE7UPuIDMKBo4+qeKQw9vrsZglSNbqjJet2oOVzm7TMn9wPQm71ClefxT1lxHx/V/01jhfy3jlEPjHi756cycOQposvFzBqU8u1UyoxurifUtmpDm2f45uX6/vrUhqLCcDbJzU447GWAiKrmFRyWH7K6/AS3YNIMwdHiojF+TvmXgRO+49mDMRi8nLlCJwZHePDecU09Ir6f5ym/YsUeJHhLPwwiqHuf8lZZdtSVNOo+8FHwdRZzFwxcApR782XZSIlBbGJgDHaIF6TKrOU+C7UyxhWcmyRP6Xm06OGbcl/9nJj1Yg=
34-
file: cpp-hocon.tar.gz
35+
file_glob: true
36+
file: cpp-hocon*.tar.gz
3537
skip_cleanup: true
3638
on:
3739
repo: puppetlabs/cpp-hocon

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.2.2)
44
# Project Setup - modify to match project naming
55
## Source code for a simple command-line executable for a dynamic library will be generated from the project name.
66
## The command-line and library names will be based off the project name.
7-
project(cpp-hocon VERSION 0.2.0)
7+
project(cpp-hocon VERSION 0.2.1)
88

99
string(MAKE_C_IDENTIFIER ${PROJECT_NAME} PROJECT_C_NAME)
1010
string(TOUPPER ${PROJECT_C_NAME} PROJECT_NAME_UPPER)

0 commit comments

Comments
 (0)