Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
os: [ ubuntu-latest, windows-latest, macos-latest ]
ruby: [ jruby-9.4.12.0, jruby-head ]

runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ include $(SUB_IMPLMK)
# Pick conf based on OS. for mingw64, must manually override for now.
ifeq ($(OS),Windows_NT)
CC=gcc
CONF=mingw
CONF=mingw64
else
CONF=unix
endif
Expand Down
3 changes: 2 additions & 1 deletion spec/launcher_spec.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
require 'tmpdir'
require 'rbconfig'
require File.expand_path('../spec_helper.rb', __FILE__)
load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)

describe "JRuby native launcher", if: /Windows/.match?(ENV_JAVA['os.name']) do
describe "JRuby native launcher", if: /mswin/.match?(RbConfig::CONFIG['host_os']) do
it "should run org.jruby.Main" do
jruby_launcher_args("").last.should == "org/jruby/Main"
end
Expand Down
Loading