Compare commits
16 Commits
master
...
travis-win
Author | SHA1 | Date |
---|---|---|
|
19e69096c6 | |
|
c768b3c4f0 | |
|
ccfccea248 | |
|
0a8de75ca9 | |
|
939bc3f312 | |
|
b2547d5d58 | |
|
d4056d1562 | |
|
230c640f16 | |
|
f1882af4fe | |
|
e3c72ca87d | |
|
523f39e4fd | |
|
4bafdb0ee4 | |
|
0de008d0ad | |
|
c652a6c455 | |
|
ae1a9285dc | |
|
15e3715744 |
11
.travis.yml
11
.travis.yml
|
@ -34,7 +34,10 @@ addons:
|
||||||
- libsnappy-dev
|
- libsnappy-dev
|
||||||
before_install:
|
before_install:
|
||||||
- uname -s
|
- uname -s
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./build.sh deps-macosx ; else ./build.sh deps-apt-get ; fi
|
- echo "$TRAVIS_OS_NAME"
|
||||||
|
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install make; fi
|
||||||
|
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install visualstudio2017professional; fi
|
||||||
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./build.sh deps-macosx ; else ./build.sh deps-apt-get; fi
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions snappy > /dev/null || brew install snappy; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions snappy > /dev/null || brew install snappy; fi
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions cmake > /dev/null || brew install cmake; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions cmake > /dev/null || brew install cmake; fi
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions libmagic > /dev/null || brew install libmagic; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew ls --versions libmagic > /dev/null || brew install libmagic; fi
|
||||||
|
@ -67,7 +70,11 @@ script:
|
||||||
- echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, TRAVIS_PULL_REQUEST_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH"
|
- echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, TRAVIS_PULL_REQUEST_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH"
|
||||||
- export CI_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
|
- export CI_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
|
||||||
- echo "CI_BRANCH=${CI_BRANCH}"
|
- echo "CI_BRANCH=${CI_BRANCH}"
|
||||||
- DEBUG=1 ./build.sh net-bootstrap < /dev/null
|
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
|
||||||
|
%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\\vcvarsall.bat"" amd64;
|
||||||
|
build.cmd;
|
||||||
|
fi
|
||||||
|
- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then DEBUG=1 ./build.sh net-bootstrap < /dev/null; fi
|
||||||
- "./factor -e='USING: memory vocabs.hierarchy ; \"zealot\" load save'"
|
- "./factor -e='USING: memory vocabs.hierarchy ; \"zealot\" load save'"
|
||||||
- './factor -run=zealot.cli-changed-vocabs'
|
- './factor -run=zealot.cli-changed-vocabs'
|
||||||
- './factor -run=tools.test `./factor -run=zealot.cli-changed-vocabs | paste -s -d " " -`'
|
- './factor -run=tools.test `./factor -run=zealot.cli-changed-vocabs | paste -s -d " " -`'
|
||||||
|
|
4
build.sh
4
build.sh
|
@ -277,11 +277,11 @@ find_architecture() {
|
||||||
|
|
||||||
find_num_cores() {
|
find_num_cores() {
|
||||||
$ECHO "Finding num cores..."
|
$ECHO "Finding num cores..."
|
||||||
NUM_CORES=7ZZ
|
NUM_CORES=2
|
||||||
uname_s=$(uname -s)
|
uname_s=$(uname -s)
|
||||||
check_ret uname
|
check_ret uname
|
||||||
case $uname_s in
|
case $uname_s in
|
||||||
CYGWIN_NT-5.2-WOW64 | *CYGWIN_NT* | *CYGWIN* | MINGW32*) NUM_CORES=$NUMBER_OF_PROCESSORS;;
|
CYGWIN_NT-5.2-WOW64 | *CYGWIN_NT* | *CYGWIN* | MINGW32* | MSYS_NT*) NUM_CORES=$NUMBER_OF_PROCESSORS;;
|
||||||
*darwin* | *Darwin* | *linux* | *Linux*) NUM_CORES=$(getconf _NPROCESSORS_ONLN);;
|
*darwin* | *Darwin* | *linux* | *Linux*) NUM_CORES=$(getconf _NPROCESSORS_ONLN);;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue