Skip to content

Commit 00687d9

Browse files
committed
only support shakapacker on 2.7.7
1 parent 7518ea5 commit 00687d9

File tree

97 files changed

+13
-8766
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+13
-8766
lines changed

.DS_Store

6 KB
Binary file not shown.

.github/workflows/ruby.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,8 @@ jobs:
1111
test:
1212
strategy:
1313
fail-fast: false
14-
matrix:
15-
ruby:
16-
- 2.7.7
17-
- 2.6.5
18-
# TODO restore testing against JRuby w/ therubyrhino
19-
# - jruby-9.3.7.0
20-
gemfile:
21-
- rails_7.0_no_sprockets_shakapacker_6
22-
- rails_5.2_no_sprockets
23-
- rails_5.2_sprockets_3
24-
- rails_5.2_sprockets_4
2514
runs-on: ubuntu-latest
2615
env:
27-
# $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
28-
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
2916
# Workaround b/c upgrading Minitest broke some mocking expectations
3017
# having to do with automatic kwarg splatting
3118
MT_KWARGS_HACK: 1
@@ -34,7 +21,7 @@ jobs:
3421
- uses: actions/setup-node@v3
3522
- uses: ruby/setup-ruby@v1
3623
with:
37-
ruby-version: ${{ matrix.ruby }}
24+
ruby-version: 2.7.7
3825
# TODO: Impalement caching
3926
# bundler-cache: true
4027
- run: bundle install

Appraisals

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
appraise 'rails-5.2-sprockets_4' do
2-
gem 'rails', '~> 5.2.x'
1+
appraise 'rails-7.0-sprockets_4' do
2+
gem 'rails', '~> 7.0.x'
33
gem 'sprockets', '~> 4.0.x'
44
gem 'turbolinks', '~> 5'
55
gem 'mini_racer', :platforms => :mri
66
gem 'therubyrhino', :platforms => :jruby
77
end
88

9-
appraise 'rails-5.2-sprockets_3' do
10-
gem 'rails', '~> 5.2.x'
9+
appraise 'rails-7.0-sprockets_3' do
10+
gem 'rails', '~> 7.0.x'
1111
gem 'sprockets', '~> 3.5'
1212
gem 'turbolinks', '~> 5'
1313
gem 'mini_racer', :platforms => :mri
@@ -21,10 +21,10 @@ appraise 'rails-7.0_no_sprockets_shakapacker_6' do
2121
gem 'therubyrhino', :platforms => :jruby
2222
end
2323

24-
appraise 'rails-5.2-no_sprockets' do
24+
appraise 'rails-7.0-no_sprockets' do
2525
# Appraisal adds `turbolinks` to this gemfile because it is
2626
# present in `./Gemfile`.
2727
# But it causes this gemfile to break, so it must be removed
2828
# from `./gemfiles/rails_5_no_sprockets.gemfile` manually.
29-
gem 'rails', '~> 5.2.x'
29+
gem 'rails', '~> 7.0.x'
3030
end

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
source 'http://rubygems.org'
22

33
gemspec
4-
# This is an optional dev-dependency, required whenever sprockets is required

Gemfile.lock

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ GEM
154154
nokogiri (1.13.10)
155155
mini_portile2 (~> 2.8.0)
156156
racc (~> 1.4)
157+
nokogiri (1.13.10-x86_64-linux)
158+
racc (~> 1.4)
157159
notiffany (0.1.3)
158160
nenv (~> 0.1)
159161
shellany (~> 0.0)
@@ -240,10 +242,11 @@ GEM
240242

241243
PLATFORMS
242244
ruby
245+
x86_64-linux
243246

244247
DEPENDENCIES
245248
appraisal
246-
bundler (~> 2.0)
249+
bundler (= 2.4.9)
247250
capybara
248251
codeclimate-test-reporter
249252
coffee-rails
@@ -261,4 +264,4 @@ DEPENDENCIES
261264
webdrivers
262265

263266
BUNDLED WITH
264-
2.1.4
267+
2.4.9

Rakefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ task default: :test
8585

8686
task :test_setup do
8787
load 'webdrivers/Rakefile'
88-
Dir.chdir('./test/dummy_sprockets') do
89-
`yarn install`
90-
end
9188
Dir.chdir('./test/dummy_shakapacker') do
9289
`yarn install`
9390
end

gemfiles/.bundle/config

Lines changed: 0 additions & 2 deletions
This file was deleted.

gemfiles/rails_5.2_no_sprockets.gemfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

gemfiles/rails_5.2_no_sprockets.gemfile.lock

Lines changed: 0 additions & 239 deletions
This file was deleted.

gemfiles/rails_5.2_sprockets_3.gemfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)