Skip to content

Commit

Permalink
Revert "Change how the git CLI subprocess is executed (#684)"
Browse files Browse the repository at this point in the history
This reverts commit 47a0c13.
  • Loading branch information
jcouball committed Mar 19, 2024
1 parent 1b5c56b commit d715004
Show file tree
Hide file tree
Showing 21 changed files with 550 additions and 1,062 deletions.
38 changes: 17 additions & 21 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,35 @@ name: CI

on:
push:
branches: [master,v1]
branches: [master]
pull_request:
branches: [master,v1]
branches: [master]
workflow_dispatch:

jobs:
build:
name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
continue-on-error: ${{ matrix.experimental == 'Yes' }}
env: { JAVA_OPTS: -Djdk.io.File.enableADS=true }

continuous_integration_build:
continue-on-error: true
strategy:
fail-fast: false
matrix:
# Only the latest versions of JRuby and TruffleRuby are tested
ruby: ["3.0", "3.1", "3.2", "3.3", "truffleruby-23.1.1", "jruby-9.4.5.0"]
ruby: [3.0, 3.1, 3.2, 3.3]
operating-system: [ubuntu-latest]
experimental: [No]
include:
- # Building against head version of Ruby is considered experimental
ruby: head
- ruby: head
operating-system: ubuntu-latest
experimental: Yes

- # Only test with minimal Ruby version on Windows
ruby: 3.0
- ruby: truffleruby-23.1.1
operating-system: ubuntu-latest
- ruby: 3.0
operating-system: windows-latest

- # Since JRuby on Windows is known to not work, consider this experimental
ruby: jruby-9.4.5.0
- ruby: jruby-9.4.5.0
operating-system: windows-latest
experimental: Yes

name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}

runs-on: ${{ matrix.operating-system }}

env:
JAVA_OPTS: -Djdk.io.File.enableADS=true

steps:
- name: Checkout Code
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The changes coming in this major release include:
* Update the required Git command line version to at least 2.28
* Update how CLI commands are called to use the [process_executer](https://github.com/main-branch/process_executer)
gem which is built on top of [Kernel.spawn](https://ruby-doc.org/3.3.0/Kernel.html#method-i-spawn).
See [PR #684](https://github.com/ruby-git/ruby-git/pull/684) for more details
See [PR #617](https://github.com/ruby-git/ruby-git/pull/617) for more details
on the motivation for this implementation.

The tentative plan is to release `2.0.0` near the end of March 2024 depending on
Expand Down
180 changes: 0 additions & 180 deletions bin/command_line_test

This file was deleted.

1 change: 0 additions & 1 deletion git.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Gem::Specification.new do |s|
s.requirements = ['git 2.28.0 or greater']

s.add_runtime_dependency 'addressable', '~> 2.8'
s.add_runtime_dependency 'process_executer', '~> 0.7'
s.add_runtime_dependency 'rchardet', '~> 1.8'

s.add_development_dependency 'minitar', '~> 0.9'
Expand Down
2 changes: 0 additions & 2 deletions lib/git.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
require 'git/branch'
require 'git/branches'
require 'git/command_line_result'
require 'git/command_line'
require 'git/config'
require 'git/diff'
require 'git/encoding_utils'
Expand All @@ -24,7 +23,6 @@
require 'git/repository'
require 'git/signaled_error'
require 'git/status'
require 'git/signaled_error'
require 'git/stash'
require 'git/stashes'
require 'git/url'
Expand Down

0 comments on commit d715004

Please sign in to comment.