generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-07 14:37:32 +01:00
Code Issues Projects Releases Wiki Activity

Resolve conflict

Browse Source
This commit is contained in:
Francis ANDRE
2018-09-28 11:52:38 +02:00
parent 8716de6537
commit 6d3abb9023
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@@ -36,7 +36,6 @@ before_script:
matrix: matrix:
include: include:
<<<<<<< HEAD
- env: TEST_NAME="Gradle" - env: TEST_NAME="Gradle"
os: osx os: osx
compiler: clang compiler: clang
@@ -52,17 +51,6 @@ matrix:
script: script:
- chmod 777 ./gradle/bin/gradle - chmod 777 ./gradle/bin/gradle
- ./gradle/bin/gradle --console=plain -g travis -c travis/settings.gradle poco check -Ptest=-all - ./gradle/bin/gradle --console=plain -g travis -c travis/settings.gradle poco check -Ptest=-all
- cat Crypto/guild/tmp/linkCryptoLinux64DebugSharedLibrary/*
=======
# - env: TEST_NAME="Gradle"
# os: osx
# compiler: clang
# script:
# - brew install mysql
# - brew install unixodbc
# - chmod 777 ./gradle/bin/gradle
# - ./gradle/bin/gradle --console=plain -g travis -c settings.gradle poco check -Ptest=-all
>>>>>>> refs/remotes/origin/poco-1.9.1
- env: TEST_NAME="android API level 19" - env: TEST_NAME="android API level 19"
language: android language: android