Skip to content

Commit 38521bb

Browse files
authored
Merge pull request #38 from yoshoku/ruby3_gha
Add 3.0 and Head to the version of Ruby running in CI
2 parents 04c0470 + bda741c commit 38521bb

2 files changed

Lines changed: 27 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ name: build
33
on: [push, pull_request]
44

55
jobs:
6-
build:
6+
release-versions:
7+
name: Build on ruby-${{ matrix.ruby }}
78
runs-on: ubuntu-latest
89
strategy:
910
fail-fast: false
1011
matrix:
11-
ruby: [ '2.5', '2.6', '2.7' ]
12+
ruby: [ '2.5', '2.6', '2.7', '3.0' ]
1213
steps:
1314
- uses: actions/checkout@v2
1415
- name: Install BLAS and LAPACK
@@ -22,3 +23,25 @@ jobs:
2223
gem install --no-document bundler
2324
bundle install --jobs 4 --retry 3
2425
bundle exec rake
26+
27+
ruby-head:
28+
name: Build on ruby-head
29+
runs-on: ubuntu-latest
30+
continue-on-error: true
31+
strategy:
32+
fail-fast: false
33+
matrix:
34+
ruby: [ 'debug' ]
35+
steps:
36+
- uses: actions/checkout@v2
37+
- name: Install BLAS and LAPACK
38+
run: sudo apt-get install -y libopenblas-dev liblapacke-dev
39+
- name: Set up Ruby ${{ matrix.ruby }}
40+
uses: ruby/setup-ruby@v1
41+
with:
42+
ruby-version: ${{ matrix.ruby }}
43+
- name: Build and test with Rake
44+
run: |
45+
gem install --no-document bundler
46+
bundle install --jobs 4 --retry 3
47+
bundle exec rake

lib/numo/linalg/autoloader.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ def load_library
2626
lapacke_dirs = ['/opt/lapack/lib', '/opt/lapack/lib64', '/opt/local/lib/lapack',
2727
'/usr/local/opt/lapack/lib']
2828
opt_dirs = ['/opt/local/lib', '/opt/local/lib64', '/opt/lib', '/opt/lib64']
29-
base_dirs = ['/usr/local/lib', '/usr/local/lib64', '/usr/lib', '/usr/lib64',
30-
"/usr/lib/#{RbConfig::CONFIG['host_cpu']}-#{RbConfig::CONFIG['host_os']}"]
29+
base_dirs = ['/usr/local/lib', '/usr/local/lib64', '/usr/lib', '/usr/lib64']
30+
base_dirs.concat(Dir["/usr/lib/#{RbConfig::CONFIG['host_cpu']}-*"])
3131
base_dirs.unshift(*ENV['LD_LIBRARY_PATH'].split(':')) unless ENV['LD_LIBRARY_PATH'].nil?
3232

3333
mkl_libs = find_mkl_libs([*base_dirs, *opt_dirs, *mkl_dirs])

0 commit comments

Comments
 (0)