sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #241 from marckleinebudde/travis 

travis: fix indention
pull/244/head
Marc Kleine-Budde 2020-09-25 15:33:55 +02:00 committed by GitHub
parent e1f75da433 7fb2585641
commit dd8fb0b697
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -27,7 +27,7 @@ matrix:
before_script: before_script:
- mkdir gcc_rel && cd gcc_rel - mkdir gcc_rel && cd gcc_rel
- cmake .. - cmake ..
script: make script: make
- env: test="x64 5.0 (CMake clang)" - env: test="x64 5.0 (CMake clang)"
os: linux os: linux
@ -36,7 +36,7 @@ matrix:
before_script: before_script:
- mkdir clang_rel && cd clang_rel - mkdir clang_rel && cd clang_rel
- cmake .. - cmake ..
script: make script: make
- env: test="x64 5.0 (CMake clang - Ninja) Debug" - env: test="x64 5.0 (CMake clang - Ninja) Debug"
os: linux os: linux
@ -45,15 +45,15 @@ matrix:
before_script: before_script:
- mkdir clang_ninja_dbg && cd clang_ninja_dbg - mkdir clang_ninja_dbg && cd clang_ninja_dbg
- cmake .. -GNinja -DCMAKE_BUILD_TYPE=Debug - cmake .. -GNinja -DCMAKE_BUILD_TYPE=Debug
script: ninja script: ninja
- env: test="Android NDK (CMake)" - env: test="Android NDK (CMake)"
os: linux os: linux
language: android language: android
android: android:
components: components:
- build-tools-25.0.2 - build-tools-25.0.2
install: install:
- echo y | sdkmanager "ndk-bundle" - echo y | sdkmanager "ndk-bundle"
- echo y | sdkmanager "cmake;3.6.4111459" - echo y | sdkmanager "cmake;3.6.4111459"
before_script: before_script: