Skip to content

Commit 5d39810

Browse files
rdegnanOlegDokuka
authored andcommitted
Try installing protobuf without homebrew
(cherry picked from commit 8c006b4)
1 parent d55e626 commit 5d39810

File tree

2 files changed

+31
-15
lines changed

2 files changed

+31
-15
lines changed

.travis.yml

+31-14
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,46 @@ sudo: required
22
jobs:
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+
filter_secrets: false
19+
env:
20+
- GRADLE_OPTS="-Dorg.gradle.daemon=false"
21+
before_install:
22+
- rm -r "/c/Program Files (x86)/Microsoft Visual Studio 14.0"
23+
- export PATH=$PATH:"/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64"
24+
- choco install -y jdk8 --version 8.0.201
25+
- export PATH=$PATH:"/c/Program Files/Java/jdk1.8.0_201/bin"
26+
- wget https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
27+
- tar -xzf protobuf-cpp-3.6.1.tar.gz
28+
- pushd protobuf-3.6.1/cmake
29+
- mkdir build && cd build
30+
- cmake -A x64 -DCMAKE_INSTALL_PREFIX="/c/Program Files/protobuf" -DCMAKE_CXX_FLAGS="-std=c++11 -EHsc" -Dprotobuf_BUILD_TESTS=OFF ..
31+
- cmake --build . --config Release --target install
32+
- popd
1333
script: "./ci/travis.sh"
1434
- stage: deploy
35+
language: cpp
1536
os: osx
16-
osx_image: xcode9.4
17-
language: generic
18-
env:
19-
- HOMEBREW_TEMP="/tmp"
20-
- LDFLAGS="/usr/local/lib/libprotobuf.a /usr/local/lib/libprotoc.a"
37+
osx_image: xcode10.1
38+
compiler: clang
2139
before_install:
22-
- brew update
23-
- pushd $(brew --repo)/Library/Taps/homebrew/homebrew-core
24-
- git checkout 25a1892 Formula/protobuf.rb
25-
- EDITOR="sed -i '' 's/system \".\/configure\",/system \".\/configure\", \"--disable-shared\",/g'"
26-
brew edit protobuf
27-
- brew install protobuf
40+
- curl -O -L https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
41+
- tar -xzf protobuf-cpp-3.6.1.tar.gz
42+
- pushd protobuf-3.6.1
43+
- ./autogen.sh
44+
- ./configure --disable-shared && make && sudo make install
2845
- popd
2946
script: "./ci/travis.sh"
3047
before_cache:

publication.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ configure(subprojects.findAll {it.name != 'rsocket-rpc-protobuf'}) {
1111
options.with {
1212
links 'https://docs.oracle.com/javase/8/docs/api/'
1313
links 'https://projectreactor.io/docs/core/release/api/'
14-
links 'https://netty.io/4.1/api/'
1514
}
1615
}
1716

0 commit comments

Comments
 (0)