Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8543eaec479
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 790a3f3dd5be
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Mar 7, 2016

  1. [Truffle] j+tr: remove no longer used stored_commands from openweather

    @pitr-ch
    pitr-ch committed Mar 7, 2016
    Copy the full SHA
    74d3291 View commit details

  2. [Truffle] j+tr: Updates 

    -   make option blocks avaliable in ci definition
-   move --interpreter-path option to run
-   ci command runs setup and run commands within the same process
    (ensures that it will execute on the same Ruby interpreter)
-   ci definition can define its own options (see default)
-   remove unused Ruby evaluation in Yaml
-   ci command accepts --definition NAME option to use different ci defintion
    than default (or with different name than the one of the tested gem)
-   default ci-definition takes option --version
-   bundler helper method added to CIEnvironment
-   bundler has to run it's own process (uses same ruby executable as the tool)
    @pitr-ch
    pitr-ch committed Mar 7, 2016
    Copy the full SHA
    790a3f3 View commit details
3 changes: 2 additions & 1 deletion lib/ruby/truffle/jruby+truffle/bin/jruby+truffle
View file
Original file line number Diff line number Diff line change
@@ -2,4 +2,5 @@

require_relative '../lib/runner.rb'

JRubyTruffleRunner.new
runner = JRubyTruffleRunner.new
exit runner.run
4 changes: 3 additions & 1 deletion lib/ruby/truffle/jruby+truffle/gem_ci/activesupport.rb
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,9 @@
git_clone 'https://github.com/rails/rails.git', branch: '4-2-stable'
end

setup
use_only_https_git_paths!

has_to_succeed setup

result run(%w[--require-pattern test/**/*_test.rb -r exclude_tests -- -I test -e nil], raise: false)

11 changes: 9 additions & 2 deletions lib/ruby/truffle/jruby+truffle/gem_ci/default.rb
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
declare_options git: ['--git URL', 'Path to the gem\'s repository', STORE_NEW_VALUE, nil],
version: ['--version VERSION', 'Version of the gem', STORE_NEW_VALUE, nil]

unless File.exists? repository_dir
git_clone option(:git)
git_clone option(:git),
tag: get_git_tag(option(:version))
end

setup
delete_gemfile_lock!
use_only_https_git_paths!

has_to_succeed setup

result run(%w[-S rake], raise: false)

8 changes: 0 additions & 8 deletions lib/ruby/truffle/jruby+truffle/gem_configurations/openweather.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
:setup:
:file:
"bundler/gem_tasks.rb": nil
:stored_commands:
:ci:
- :setup
- :test
:setup:
- "git clone git@github.com:lucasocon/openweather.git"
- "jruby+truffle --dir openweather setup"
:test: "jruby+truffle --dir openweather run --require-pattern 'test/*_test.rb' -I test -- -e nil"

Loading