Skip to content

Commit cf0ca10

Browse files
committed
Allow failures on windows
1 parent 2b8ef61 commit cf0ca10

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

.travis.yml

Lines changed: 20 additions & 18 deletions
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
@@ -12,24 +14,24 @@ jobs:
1214
- ./configure --disable-shared && make && sudo make install
1315
- popd
1416
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
32-
# script: "./ci/travis.sh"
17+
- stage: build
18+
language: cpp
19+
os: windows
20+
env:
21+
- GRADLE_OPTS="-Dorg.gradle.daemon=false"
22+
before_install:
23+
- rm -r "/c/Program Files (x86)/Microsoft Visual Studio 14.0"
24+
- export PATH=$PATH:"/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64"
25+
- choco install -y jdk8 --version 8.0.201
26+
- export PATH=$PATH:"/c/Program Files/Java/jdk1.8.0_201/bin"
27+
- wget https://github.com/google/protobuf/releases/download/v3.6.1/protobuf-cpp-3.6.1.tar.gz
28+
- tar -xzf protobuf-cpp-3.6.1.tar.gz
29+
- pushd protobuf-3.6.1/cmake
30+
- mkdir build && cd build
31+
- cmake -A x64 -DCMAKE_INSTALL_PREFIX="/c/Program Files/protobuf" -DCMAKE_CXX_FLAGS="-std=c++11 -EHsc" -Dprotobuf_BUILD_TESTS=OFF ..
32+
- cmake --build . --config Release --target install
33+
- popd
34+
script: "./ci/travis.sh"
3335
- stage: deploy
3436
language: cpp
3537
os: osx

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=io.rsocket.rpc
2-
version=0.2.14
2+
version=0.2.15.BUILD-SNAPSHOT

0 commit comments

Comments
 (0)