fixes more

shakacode · Jun 14, 2024 · 8a0003e · 8a0003e
1 parent 446c090
commit 8a0003e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/rspec-package-specs.yml b/.github/workflows/rspec-package-specs.yml
@@ -39,6 +39,7 @@ jobs:
       run: echo "gem 'shakapacker', '~> ${{ matrix.versions == 'oldest' && '6.6.0' || '8.0.0' }}'" >> Gemfile
     - name: Install Ruby Gems for package
       run: bundle check --path=vendor/bundle || bundle  _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
+    - run: git commit -am "to stop generators from complaining about uncommitted code"
     - name: Run rspec tests
       run: bundle exec rspec spec/react_on_rails
     - name: Store test results

diff --git a/rakelib/examples.rake b/rakelib/examples.rake
@@ -7,7 +7,6 @@
 
 require "yaml"
 require "rails/version"
-require "react_on_rails"
 
 require_relative "example_type"
 require_relative "task_helpers"
@@ -36,7 +35,11 @@ namespace :examples do # rubocop:disable Metrics/BlockLength
       sh_in_dir(example_type.dir, "touch .gitignore")
       append_to_gemfile(example_type.gemfile, example_type.required_gems)
       bundle_install_in(example_type.dir)
-      sh_in_dir(example_type.dir, "rake #{ReactOnRails::PackerUtils.packer_type}:install")
+      begin
+        sh_in_dir(example_type.dir, "rake webpacker:install")
+      rescue
+        sh_in_dir(example_type.dir, "rake shakapacker:install")
+      end
       sh_in_dir(example_type.dir, example_type.generator_shell_commands)
       sh_in_dir(example_type.dir, "yarn")
     end