Skip to content

Fix Travis-CI problems #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 21, 2016
Merged

Fix Travis-CI problems #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b58ac84
Fix clang
isuruf Oct 13, 2016
8441165
libyaml is already installed in travis-ci osx
isuruf Oct 20, 2016
e63cbb2
Move ruby=2.4.0-dev to allow_failures
isuruf Oct 20, 2016
9c264c4
Drop 1.9.3 from travis as it is not supported
isuruf Oct 20, 2016
f727e35
clang on linux is fine
isuruf Oct 20, 2016
35d0407
OpenBLAS is fine on linux
isuruf Oct 20, 2016
56c8593
Drop json requirement
isuruf Oct 20, 2016
732d4af
Add verbose to rbenv command in travis.sh
isuruf Oct 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ env:
- USE_REF=1 # Installs OpenBLAS and reference LAPACK, builds and tests nmatrix, nmatrix-lapacke
- NO_EXTERNAL_LIB=1 # No external libraries installed, only nmatrix
rvm:
- 1.9.3
- 2.0.0-p648
- 2.1.8
- 2.2.4
Expand Down Expand Up @@ -91,19 +90,19 @@ matrix:
env:
- ruby_version=2.1.8 USE_OPENBLAS=1
allow_failures:
# Ruby versions which got EOL
- rvm: 1.9.3
# trunk
- rvm: ruby-head
- rvm: ruby-head-clang
- env: ruby_version=2.4.0-dev USE_OPENBLAS=1
- env: ruby_version=2.4.0-dev NO_EXTERNAL_LIB=1
# linux with clang
- os: linux
rvm: 2.3.0-clang
# For some reason this OpenBLAS configuration isn't working on travis, disable it for now.
- os: linux
env: USE_OPENBLAS=1
- os: osx
compiler: clang
rvm: 2.2
env:
- ruby_version=2.4.0-dev USE_OPENBLAS=1
- os: osx
compiler: clang
rvm: 2.2
env:
- ruby_version=2.4.0-dev NO_EXTERNAL_LIB=1

notifications:
irc: "chat.freenode.net#sciruby"
2 changes: 1 addition & 1 deletion ext/nmatrix/data/ruby_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class RubyObject {
inline operator VALUE() const { return rval; }
//inline operator uint32_t() const { return NUM2ULONG(this->rval); }
inline operator int64_t() const { RETURN_OBJ2NUM(NUM2LONG) }
inline operator uint64_t() const { RETURN_OBJ2NUM(NUM2ULONG) }
//inline operator uint64_t() const { RETURN_OBJ2NUM(NUM2ULONG) }
inline operator double() const { RETURN_OBJ2NUM(NUM2DBL) }
inline operator float() const { RETURN_OBJ2NUM(NUM2DBL) }

Expand Down
1 change: 0 additions & 1 deletion nmatrix.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ EOF

gem.add_dependency 'packable', '~> 1.3', '>= 1.3.5'
gem.add_development_dependency 'bundler', '~>1.6'
gem.add_development_dependency 'json', '~>2.0.1' if RUBY_VERSION >= '2.1.0'
gem.add_development_dependency 'pry', '~>0.10'
gem.add_development_dependency 'rake', '~>10.3'
gem.add_development_dependency 'rake-compiler', '~>0.8'
Expand Down
4 changes: 2 additions & 2 deletions travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ then

# Install ruby
(
brew install bison openssl readline libyaml
brew install bison openssl readline
brew link --force openssl
RBENV_VERSION=system
MAKEOPTS='-j 4'
CONFIGURE_OPTS="--disable-install-doc --with-out-ext=tk,tk/tkutil --with-opt-dir=/usr/local"
rbenv install $ruby_version
rbenv install --verbose $ruby_version
)

gem pristine --all
Expand Down