From 8cc98f0ff9ec704e804a56f78cd2801ba181c44e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Fri, 18 Aug 2023 09:49:13 -0700 Subject: [PATCH] Fix sassc-rails test --- .github/workflows/build.yml | 2 +- test/patches/sassc-rails.diff | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19537ae..e694f77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: fail-fast: false matrix: os: [macos-latest, ubuntu-latest, windows-latest] - ruby-version: ['2.7', '3.0', '3.1'] + ruby-version: ['2.7', '3.0', '3.1', '3.2', 'jruby'] submodule: - vendor/github.com/sass/sassc-rails - vendor/github.com/twbs/bootstrap diff --git a/test/patches/sassc-rails.diff b/test/patches/sassc-rails.diff index ebcb578..4e1642f 100644 --- a/test/patches/sassc-rails.diff +++ b/test/patches/sassc-rails.diff @@ -102,6 +102,29 @@ index bf7d65c..9cfbedc 100644 +gem 'tzinfo-data' if Gem.win_platform? +gem 'sassc', github: 'sass/sassc-ruby', ref: 'refs/pull/233/head' +gem 'sassc-embedded', path: '../../../../..' +diff --git a/sassc-rails.gemspec b/sassc-rails.gemspec +index 38349f7..34a4eb9 100644 +--- a/sassc-rails.gemspec ++++ b/sassc-rails.gemspec +@@ -20,13 +20,13 @@ Gem::Specification.new do |spec| + + spec.add_development_dependency 'pry' + spec.add_development_dependency "bundler" +- spec.add_development_dependency "rake", "~> 10.0" ++ spec.add_development_dependency "rake" + spec.add_development_dependency 'mocha' + +- spec.add_dependency "sassc", ">= 2.0" ++ spec.add_dependency "sassc", "~> 2.4" + spec.add_dependency "tilt" + +- spec.add_dependency 'railties', '>= 4.0.0' +- spec.add_dependency 'sprockets', '> 3.0' +- spec.add_dependency 'sprockets-rails' ++ spec.add_dependency 'railties', '~> 6.1' ++ spec.add_dependency 'sprockets', '~> 4.2' ++ spec.add_dependency 'sprockets-rails', '~> 3.4' + end diff --git a/test/sassc_rails_test.rb b/test/sassc_rails_test.rb index a15110d..452a251 100644 --- a/test/sassc_rails_test.rb