File tree Expand file tree Collapse file tree 2 files changed +31
-6
lines changed
Expand file tree Collapse file tree 2 files changed +31
-6
lines changed Original file line number Diff line number Diff line change @@ -2,19 +2,38 @@ sudo: required
22jobs :
33 include :
44 - stage : build
5+ language : cpp
56 os : linux
67 jdk : oraclejdk8
7- language : generic
88 before_install :
99 - wget https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
1010 - tar -xzvf protobuf-cpp-3.6.1.tar.gz
11- - pushd protobuf-3.6.1 && ./configure --disable-shared && make && sudo make install
12- && popd
11+ - pushd protobuf-3.6.1
12+ - ./configure --disable-shared && make && sudo make install
13+ - popd
14+ script : " ./ci/travis.sh"
15+ - stage : build
16+ language : cpp
17+ os : windows
18+ env :
19+ - GRADLE_OPTS="-Dorg.gradle.daemon=false"
20+ before_install :
21+ - rm -r "/c/Program Files (x86)/Microsoft Visual Studio 14.0"
22+ - export PATH=$PATH:"/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64"
23+ - choco install -y jdk8 --version 8.0.201
24+ - export PATH=$PATH:"/c/Program Files/Java/jdk1.8.0_201/bin"
25+ - wget https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
26+ - tar -xzf protobuf-cpp-3.6.1.tar.gz
27+ - pushd protobuf-3.6.1/cmake
28+ - mkdir build && cd build
29+ - cmake -A x64 -DCMAKE_INSTALL_PREFIX="/c/Program Files/protobuf" -DCMAKE_CXX_FLAGS="-std=c++11 -EHsc" -Dprotobuf_BUILD_TESTS=OFF ..
30+ - cmake --build . --config Release --target install
31+ - popd
1332 script : " ./ci/travis.sh"
1433 - stage : deploy
34+ language : cpp
1535 os : osx
1636 osx_image : xcode9.4
17- language : generic
1837 env :
1938 - HOMEBREW_TEMP="/tmp"
2039 - LDFLAGS="/usr/local/lib/libprotobuf.a /usr/local/lib/libprotoc.a"
Original file line number Diff line number Diff line change 33if [ " $TRAVIS_PULL_REQUEST " != " false" ]; then
44
55 echo -e " Building PR #$TRAVIS_PULL_REQUEST [$TRAVIS_PULL_REQUEST_SLUG /$TRAVIS_PULL_REQUEST_BRANCH => $TRAVIS_REPO_SLUG /$TRAVIS_BRANCH ]"
6- ./gradlew build
6+ ./gradlew \
7+ -PvcProtobufLibs=" /c/Program Files/protobuf/lib" -PvcProtobufInclude=" /c/Program Files/protobuf/include" \
8+ build
79
810elif [ " $TRAVIS_PULL_REQUEST " == " false" ] && [ " $TRAVIS_TAG " == " " ] && [ " $bintrayUser " != " " ] ; then
911
1012 echo -e " Building Snapshot $TRAVIS_REPO_SLUG /$TRAVIS_BRANCH "
1113 ./gradlew \
1214 -PbintrayUser=" ${bintrayUser} " -PbintrayKey=" ${bintrayKey} " \
1315 -PsonatypeUsername=" ${sonatypeUsername} " -PsonatypePassword=" ${sonatypePassword} " \
16+ -PvcProtobufLibs=" /c/Program Files/protobuf/lib" -PvcProtobufInclude=" /c/Program Files/protobuf/include" \
1417 build artifactoryPublish --stacktrace
1518
1619elif [ " $TRAVIS_PULL_REQUEST " == " false" ] && [ " $TRAVIS_TAG " != " " ] && [ " $bintrayUser " != " " ] ; then
@@ -20,12 +23,15 @@ elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ] && [ "$bin
2023 -Pversion=" $TRAVIS_TAG " -Pstage=" $TRAVIS_BUILD_STAGE_NAME " \
2124 -PbintrayUser=" ${bintrayUser} " -PbintrayKey=" ${bintrayKey} " \
2225 -PsonatypeUsername=" ${sonatypeUsername} " -PsonatypePassword=" ${sonatypePassword} " \
26+ -PvcProtobufLibs=" /c/Program Files/protobuf/lib" -PvcProtobufInclude=" /c/Program Files/protobuf/include" \
2327 build bintrayUpload --stacktrace
2428
2529else
2630
2731 echo -e " Building $TRAVIS_REPO_SLUG /$TRAVIS_BRANCH "
28- ./gradlew build
32+ ./gradlew \
33+ -PvcProtobufLibs=" /c/Program Files/protobuf/lib" -PvcProtobufInclude=" /c/Program Files/protobuf/include" \
34+ build
2935
3036fi
3137
You can’t perform that action at this time.
0 commit comments