Skip to content

Commit c121885

Browse files
authored
Fix Travis-CI problems (#552)
* Fix clang * libyaml is already installed in travis-ci osx * Move ruby=2.4.0-dev to allow_failures * Drop 1.9.3 from travis as it is not supported * clang on linux is fine * OpenBLAS is fine on linux * Drop json requirement * Add verbose to rbenv command in travis.sh This would fix the build timeout issue
1 parent bd21860 commit c121885

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

.travis.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ env:
1111
- USE_REF=1 # Installs OpenBLAS and reference LAPACK, builds and tests nmatrix, nmatrix-lapacke
1212
- NO_EXTERNAL_LIB=1 # No external libraries installed, only nmatrix
1313
rvm:
14-
- 1.9.3
1514
- 2.0.0-p648
1615
- 2.1.8
1716
- 2.2.4
@@ -91,19 +90,19 @@ matrix:
9190
env:
9291
- ruby_version=2.1.8 USE_OPENBLAS=1
9392
allow_failures:
94-
# Ruby versions which got EOL
95-
- rvm: 1.9.3
9693
# trunk
9794
- rvm: ruby-head
9895
- rvm: ruby-head-clang
99-
- env: ruby_version=2.4.0-dev USE_OPENBLAS=1
100-
- env: ruby_version=2.4.0-dev NO_EXTERNAL_LIB=1
101-
# linux with clang
102-
- os: linux
103-
rvm: 2.3.0-clang
104-
# For some reason this OpenBLAS configuration isn't working on travis, disable it for now.
105-
- os: linux
106-
env: USE_OPENBLAS=1
96+
- os: osx
97+
compiler: clang
98+
rvm: 2.2
99+
env:
100+
- ruby_version=2.4.0-dev USE_OPENBLAS=1
101+
- os: osx
102+
compiler: clang
103+
rvm: 2.2
104+
env:
105+
- ruby_version=2.4.0-dev NO_EXTERNAL_LIB=1
107106

108107
notifications:
109108
irc: "chat.freenode.net#sciruby"

ext/nmatrix/data/ruby_object.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class RubyObject {
110110
inline operator VALUE() const { return rval; }
111111
//inline operator uint32_t() const { return NUM2ULONG(this->rval); }
112112
inline operator int64_t() const { RETURN_OBJ2NUM(NUM2LONG) }
113-
inline operator uint64_t() const { RETURN_OBJ2NUM(NUM2ULONG) }
113+
//inline operator uint64_t() const { RETURN_OBJ2NUM(NUM2ULONG) }
114114
inline operator double() const { RETURN_OBJ2NUM(NUM2DBL) }
115115
inline operator float() const { RETURN_OBJ2NUM(NUM2DBL) }
116116

nmatrix.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ EOF
5757

5858
gem.add_dependency 'packable', '~> 1.3', '>= 1.3.5'
5959
gem.add_development_dependency 'bundler', '~>1.6'
60-
gem.add_development_dependency 'json', '~>2.0.1' if RUBY_VERSION >= '2.1.0'
6160
gem.add_development_dependency 'pry', '~>0.10'
6261
gem.add_development_dependency 'rake', '~>10.3'
6362
gem.add_development_dependency 'rake-compiler', '~>0.8'

travis.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ then
3737

3838
# Install ruby
3939
(
40-
brew install bison openssl readline libyaml
40+
brew install bison openssl readline
4141
brew link --force openssl
4242
RBENV_VERSION=system
4343
MAKEOPTS='-j 4'
4444
CONFIGURE_OPTS="--disable-install-doc --with-out-ext=tk,tk/tkutil --with-opt-dir=/usr/local"
45-
rbenv install $ruby_version
45+
rbenv install --verbose $ruby_version
4646
)
4747

4848
gem pristine --all

0 commit comments

Comments
 (0)