WIP: try to fix ci for ruby under 3.2

trln · Nov 7, 2024 · f36bcdd · f36bcdd
1 parent 28e45fb
commit f36bcdd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -7,25 +7,27 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    env:
+      ENGINE_CART_RAILS_OPTIONS: '--skip-javascript --skip-bundle'
     strategy:
       fail-fast: false
       matrix:
         ruby: ['3.0', '3.1', '3.2', '3.3']
     name: Ruby ${{ matrix.ruby }}
-    
+
     steps:
     - uses: actions/checkout@v4
-      
+
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        
+
     - name: Install dependencies
       run: bundle install
 
     - name: Run rubocop
-      run: rake rubocop  
+      run: rake rubocop
 
     - name: Generate a Rails testing application
       run: rake engine_cart:generate

diff --git a/lib/generators/trln_argon/install_generator.rb b/lib/generators/trln_argon/install_generator.rb
@@ -69,13 +69,13 @@ def update_assets_manifest
       say_status('info', '============================', :magenta)
       say_status('info', 'Updating the assets manifest', :magenta)
       say_status('info', '============================', :magenta)
-      
+
       prepend_to_file 'app/assets/config/manifest.js', "//= link trln_argon_manifest.js\n"
       prepend_to_file 'app/assets/config/manifest.js', "//= link blacklight/manifest.js\n"
-      
-      return unless Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1')
+
+      return if IO.read('app/assets/javascripts/application.js').include?('application.js')
       append_to_file 'app/assets/config/manifest.js', "//= link application.js\n"
-    end  
+    end
 
     def install_stylesheet
       copy_file 'trln_argon.scss', 'app/assets/stylesheets/trln_argon.scss'

diff --git a/trln_argon.gemspec b/trln_argon.gemspec
@@ -58,13 +58,15 @@ Gem::Specification.new do |s|
 
     s.add_dependency 'dartsass-sprockets', '< 3.1.0'
     s.add_dependency 'sass-embedded', '<= 1.69.5'
+    s.add_dependency 'uri', '< 1.0'
     s.add_dependency 'dartsass-ruby', '>= 3.0.2'
 
   # Ruby 3.1
   # =================
   elsif Gem::Requirement.new('< 3.2').satisfied_by?(Gem::Version.new(RUBY_VERSION))
     s.add_dependency 'dartsass-sprockets'
     s.add_dependency 'sass-embedded', '<= 1.70'
+    s.add_dependency 'uri', '< 1.0'
 
   # Ruby 3.2+
   # =================