Skip to content

Commit

Permalink
Merge 0eff297 into 4422792
Browse files Browse the repository at this point in the history
  • Loading branch information
eregon committed Jun 10, 2021
2 parents 4422792 + 0eff297 commit ee9150b
Show file tree
Hide file tree
Showing 16 changed files with 73 additions and 776 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,17 @@
name: CI
on: [push, pull_request]
jobs:
test:
strategy:
fail-fast: false
matrix:
os: [ ubuntu, macos, windows ]
ruby: [ 2.6.6 ]
runs-on: ${{ matrix.os }}-latest
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- run: bundle exec rake
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -32,6 +32,6 @@ matrix:
- rvm: ruby-head
- env: "CHILDPROCESS_POSIX_SPAWN=true"
include:
- rvm: jruby-9.2.5.0
- rvm: jruby
jdk: openjdk11
env: "JAVA_OPTS_FOR_SPECS='--add-opens java.base/java.io=org.jruby.dist --add-opens java.base/sun.nio.ch=org.jruby.dist'"
18 changes: 5 additions & 13 deletions lib/childprocess.rb
Expand Up @@ -5,6 +5,8 @@
require "fcntl"
require 'logger'

require 'childprocess/unix/process_spawn_process'

module ChildProcess

@posix_spawn = false
Expand All @@ -15,15 +17,10 @@ class << self
def new(*args)
case os
when :macosx, :linux, :solaris, :bsd, :cygwin, :aix
if posix_spawn?
Unix::PosixSpawnProcess.new(args)
elsif jruby?
JRuby::Process.new(args)
else
Unix::ForkExecProcess.new(args)
end
Unix::PosixSpawnProcess.new(args)
when :windows
Windows::Process.new(args)
Unix::PosixSpawnProcess.new(args)
# Windows::Process.new(args)
else
raise Error, "unsupported platform #{platform_name.inspect}"
end
Expand Down Expand Up @@ -85,9 +82,6 @@ def posix_spawn?
raise ChildProcess::MissingPlatformError
end

require "childprocess/unix/lib"
require 'childprocess/unix/posix_spawn_process'

true
rescue ChildProcess::MissingPlatformError => ex
warn_once ex.message
Expand Down Expand Up @@ -205,6 +199,4 @@ def is_64_bit?

require 'jruby' if ChildProcess.jruby?

require 'childprocess/unix' if ChildProcess.unix?
require 'childprocess/windows' if ChildProcess.windows?
require 'childprocess/jruby' if ChildProcess.jruby?
56 changes: 0 additions & 56 deletions lib/childprocess/jruby.rb

This file was deleted.

16 changes: 0 additions & 16 deletions lib/childprocess/jruby/io.rb

This file was deleted.

184 changes: 0 additions & 184 deletions lib/childprocess/jruby/process.rb

This file was deleted.

53 changes: 0 additions & 53 deletions lib/childprocess/jruby/pump.rb

This file was deleted.

9 changes: 0 additions & 9 deletions lib/childprocess/unix.rb

This file was deleted.

0 comments on commit ee9150b

Please sign in to comment.