Skip to content

Commit fd4d447

Browse files
committed
[FIXUP] Final form
I think this is the route I am going to go with, and will most likely rebase these [FIXUP] and [DEBUG] commits out. It makes use of the `bundle install` that is already done by travis anyway (since we did a `before_install` instead of overwriting the `install`, this was being done when I switched the language back to `ruby`), it makes for a simpler diff to digest. Also... I think the `bundle exec rake ...` might be required...
1 parent db6414d commit fd4d447

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

.travis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@ env:
1515
- RVM_RUBY_VERSION=2.6
1616
- RVM_RUBY_VERSION=ruby-head
1717

18-
before_install:
19-
- sudo --help
20-
- sudo -i which ruby
21-
- sudo -i which rake
22-
- bundle install
23-
- rake --trace test:docker:$RVM_RUBY_VERSION:build
18+
after_install:
19+
- bundle exec rake test:docker:$RVM_RUBY_VERSION:build
2420

2521
script:
26-
- rake --trace test:docker:$RVM_RUBY_VERSION
22+
- bundle exec rake test:docker:$RVM_RUBY_VERSION

Rakefile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,11 @@ end
1414
# Ruby Extension
1515
# ==========================================================
1616

17-
begin
18-
require 'rake/extensiontask'
19-
Rake::ExtensionTask.new('stackprof', GEMSPEC) do |ext|
20-
ext.lib_dir = 'lib/stackprof'
21-
end
22-
task :build => :compile
23-
rescue LoadError => e
24-
# rake-compiler not installed. No problem if on CI.
25-
raise e unless ENV["TRAVIS"]
17+
require 'rake/extensiontask'
18+
Rake::ExtensionTask.new('stackprof', GEMSPEC) do |ext|
19+
ext.lib_dir = 'lib/stackprof'
2620
end
21+
task :build => :compile
2722

2823
# ==========================================================
2924
# Testing

0 commit comments

Comments
 (0)