di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Updating travis.yml script

Browse Source 
- Excluding Cygwin and Win32 from Python check
  * Tends to fail miserably...
- Added more appveyor build info
This commit is contained in:
Jacob Alexander 2016-10-10 22:31:53 -07:00
parent 133a98033e
commit 5b5aef88ff
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -76,7 +76,7 @@ matrix:
# Package Setup # Package Setup
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install git python3 ctags dfu-util tree; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3 ctags dfu-util tree; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew tap Caskroom/cask; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew tap Caskroom/cask; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install Caskroom/cask/gcc-arm-embedded; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install Caskroom/cask/gcc-arm-embedded; fi
# This may work, but we'd have to compile llvm... # This may work, but we'd have to compile llvm...

2
Lib/CMake/kll.cmake
View File

@ -19,7 +19,7 @@ if ( "${MacroModule}" STREQUAL "PartialMap" )
# Check disabled for Win32 as it can't detect version correctly (we don't use Python directly through CMake anyways) # Check disabled for Win32 as it can't detect version correctly (we don't use Python directly through CMake anyways)
# #
if ( NOT WIN32 ) if ( NOT CMAKE_HOST_WIN32 )
# Required on systems where python is 2, not 3 # Required on systems where python is 2, not 3
set ( PYTHON_EXECUTABLE set ( PYTHON_EXECUTABLE
python3 python3

2
appveyor.yml
View File

@ -80,7 +80,9 @@ build_script:
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && 7z x -o/ /cygdrive/c/gcc-arm-none-eabi.zip"' - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && 7z x -o/ /cygdrive/c/gcc-arm-none-eabi.zip"'
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && pwd"' - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && pwd"'
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && tree"' - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && tree"'
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && which cmake"'
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && cmake --version"' - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && cmake --version"'
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\"/%SCRIPT_DIR% && export wincmake_path=\"%WIN_CMAKE%\" && export PATH=\"${wincmake_path}\":$PATH && which cmake"'
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\"/%SCRIPT_DIR% && export wincmake_path=\"%WIN_CMAKE%\" && export PATH=\"${wincmake_path}\":$PATH && cmake --version"' - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\"/%SCRIPT_DIR% && export wincmake_path=\"%WIN_CMAKE%\" && export PATH=\"${wincmake_path}\":$PATH && cmake --version"'
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && git --version"' - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && git --version"'
- '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && python3 --version"' - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && python3 --version"'