Skip to content

Commit

Permalink
more wip
Browse files Browse the repository at this point in the history
  • Loading branch information
Judahmeek committed Jun 14, 2024
1 parent 6d410fd commit ab997a7
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 29 deletions.
1 change: 0 additions & 1 deletion .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
sudo yarn global add yalc
- name: yalc publish for react-on-rails
run: yalc publish
- run: gem install appraisal
- name: Install Ruby Gems for package
run: bundle lock --add-platform 'x86_64-linux' && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Ensure minimum required Chrome version
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/lint-js-and-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ jobs:
- name: Install Node modules with Yarn for renderer package
run: |
yarn install --no-progress --no-emoji
- run: gem install appraisal
- name: Install Ruby Gems for package
run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Linting of Ruby
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
bundler: 2.5.9
# libyaml-dev is needed for psych v5
# this gem depends on sdoc which depends on rdoc which depends on psych
- run: gem install appraisal
- name: Fix dependency for libyaml-dev
run: sudo apt install libyaml-dev
- name: Setup Node
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/rspec-package-specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
with:
path: vendor/bundle
key: package-app-gem-cache-${{ hashFiles(format('{0}/gemfiles/{1}.gemfile.lock', github.workspace, matrix.versions)) }}
- run: gem install appraisal
- name: Install Ruby Gems for package
run: bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
- name: Run rspec tests
Expand Down
22 changes: 4 additions & 18 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
# frozen_string_literal: true

require 'appraisal/bundler_dsl'
::Appraisal::BundlerDSL.class_eval do
def eval_gemfile(path, contents = nil)
(@eval_gemfile ||= []) << [path, contents]
end

private

def eval_gemfile_entry
@eval_gemfile.map { |(p, c)| "eval_gemfile(#{p.inspect}#{", #{c.inspect}" if c})" } * "\n\n"
end

alias_method :eval_gemfile_entry_for_dup, :eval_gemfile_entry

self::PARTS << 'eval_gemfile'
end unless ::Appraisal::BundlerDSL::PARTS[-1] == 'eval_gemfile'

source "https://rubygems.org"

gem "appraisal"
# to use appraisal to update ci gemfiles, see https://github.com/thoughtbot/appraisal/issues/154
# following appraisal use, you will need to modify the created gemfiles to use relative paths instead of absolute paths
# gem "appraisal"

# Specify your gem"s dependencies in react_on_rails.gemspec
gemspec

Expand Down
5 changes: 0 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ GEM
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
amazing_print (1.6.0)
appraisal (2.5.0)
bundler
rake
thor (>= 0.14.0)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
Expand Down Expand Up @@ -390,7 +386,6 @@ PLATFORMS

DEPENDENCIES
amazing_print
appraisal
bootsnap
capybara
capybara-screenshot
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/shakapacker_v6.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gem "shakapacker", "~> 6.6.0"

gemspec path: "../"

eval_gemfile("/Users/judahmeek/apps/react_on_rails/Gemfile.development_dependencies")
File.expand_path("../Gemfile.development_dependencies", __dir__)
2 changes: 1 addition & 1 deletion gemfiles/shakapacker_v8.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gem "shakapacker", "~> 8.0.0"

gemspec path: "../"

eval_gemfile("/Users/judahmeek/apps/react_on_rails/Gemfile.development_dependencies")
File.expand_path("../Gemfile.development_dependencies", __dir__)

0 comments on commit ab997a7

Please sign in to comment.