Skip to content

Commit 2e36bf0

Browse files
rdegnanOlegDokuka
authored andcommitted
Allow failures on windows
(cherry picked from commit cf0ca10)
1 parent 5d39810 commit 2e36bf0

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

.travis.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
sudo: required
22
jobs:
3+
allow_failures:
4+
- os: windows
35
include:
46
- stage: build
57
language: cpp
@@ -15,7 +17,6 @@ jobs:
1517
- stage: build
1618
language: cpp
1719
os: windows
18-
filter_secrets: false
1920
env:
2021
- GRADLE_OPTS="-Dorg.gradle.daemon=false"
2122
before_install:
@@ -34,14 +35,17 @@ jobs:
3435
- stage: deploy
3536
language: cpp
3637
os: osx
37-
osx_image: xcode10.1
38-
compiler: clang
38+
osx_image: xcode9.4
39+
env:
40+
- HOMEBREW_TEMP="/tmp"
41+
- LDFLAGS="/usr/local/lib/libprotobuf.a /usr/local/lib/libprotoc.a"
3942
before_install:
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
43+
- brew update
44+
- pushd $(brew --repo)/Library/Taps/homebrew/homebrew-core
45+
- git checkout 25a1892 Formula/protobuf.rb
46+
- EDITOR="sed -i '' 's/system \".\/configure\",/system \".\/configure\", \"--disable-shared\",/g'"
47+
brew edit protobuf
48+
- brew install protobuf
4549
- popd
4650
script: "./ci/travis.sh"
4751
before_cache:

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=io.rsocket.rpc
2-
version=0.2.14.BUILD-SNAPSHOT
2+
version=0.2.15.BUILD-SNAPSHOT

0 commit comments

Comments
 (0)