Compare commits

...

16 Commits

Author SHA1 Message Date
Doug Coleman 19e69096c6 asdfasdf 2018-12-30 00:44:52 -06:00
Doug Coleman c768b3c4f0 travis: asdfasdf 2018-12-30 00:35:37 -06:00
Doug Coleman ccfccea248 travis: so arbitrary 2018-12-30 00:17:22 -06:00
Doug Coleman 0a8de75ca9 travis: ugh 2018-12-30 00:16:20 -06:00
Doug Coleman 939bc3f312 travis: terrible 2018-12-30 00:07:22 -06:00
Doug Coleman b2547d5d58 travis: set vars 2018-12-29 23:59:35 -06:00
Doug Coleman d4056d1562 travis: ./build.cmd 2018-12-29 23:39:20 -06:00
Doug Coleman 230c640f16 travis: build.cmd 2018-12-29 23:30:59 -06:00
Doug Coleman f1882af4fe travis: install vs 2018-12-29 23:24:54 -06:00
Doug Coleman e3c72ca87d travis: manual build 2018-12-29 23:17:36 -06:00
Doug Coleman 523f39e4fd travis: Windows! 2018-12-29 23:11:56 -06:00
Doug Coleman 4bafdb0ee4 build.sh: Default to 2 cores instead of 7ZZ typo.. 2018-12-29 23:04:16 -06:00
Doug Coleman 0de008d0ad travis 2018-12-29 16:51:03 -06:00
Doug Coleman c652a6c455 travis: os name 2018-12-29 16:47:44 -06:00
Doug Coleman ae1a9285dc travis: choco is already installed, just use it 2018-12-29 16:42:56 -06:00
Doug Coleman 15e3715744 travis: Try using chocolatey to install make on a branch. 2018-12-29 16:36:11 -06:00
2 changed files with 11 additions and 4 deletions

View File

@ -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 " " -`'

View File

@ -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
} }