diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 063e7a9..20dc1d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,10 +32,25 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} - - run: bundle install + bundler-cache: true - name: Tests run: bundle exec rake test + tests_successful: + name: Tests passing? + needs: tests + if: always() + runs-on: ubuntu-latest + steps: + - run: | + if ${{ needs.tests.result == 'success' }} + then + echo "All tests pass" + else + echo "Some tests failed" + false + fi + linter: runs-on: ubuntu-latest name: Linting of Ruby files diff --git a/charcoal.gemspec b/charcoal.gemspec index 372367d..8693e82 100644 --- a/charcoal.gemspec +++ b/charcoal.gemspec @@ -13,11 +13,6 @@ Gem::Specification.new("charcoal", Charcoal::VERSION) do |s| s.licenses = ["MIT"] - s.add_runtime_dependency "activesupport", ">= 6.1" - s.add_runtime_dependency "actionpack", ">= 6.1" - - s.add_development_dependency "rake" - s.add_development_dependency "yard", ">= 0.9.11" - - s.add_development_dependency "shoulda", "~> 3.0" + s.add_dependency "activesupport", ">= 6.1" + s.add_dependency "actionpack", ">= 6.1" end diff --git a/gemfiles/common.rb b/gemfiles/common.rb index 7fbe618..12e910a 100644 --- a/gemfiles/common.rb +++ b/gemfiles/common.rb @@ -3,4 +3,7 @@ gemspec path: "../" gem "byebug", platforms: :mri +gem "rake" +gem "shoulda", "~> 3.0" gem "standard" +gem "yard", ">= 0.9.11" diff --git a/gemfiles/rails6.1.gemfile b/gemfiles/rails6.1.gemfile index 5a3bc6e..3291423 100644 --- a/gemfiles/rails6.1.gemfile +++ b/gemfiles/rails6.1.gemfile @@ -1,4 +1,3 @@ eval_gemfile "common.rb" gem "rails", "~> 6.1.0" -gem "actionpack-action_caching" diff --git a/gemfiles/rails7.0.gemfile b/gemfiles/rails7.0.gemfile index b8d20d1..56f4f2e 100644 --- a/gemfiles/rails7.0.gemfile +++ b/gemfiles/rails7.0.gemfile @@ -1,4 +1,3 @@ eval_gemfile "common.rb" gem "rails", "~> 7.0.0" -gem "actionpack-action_caching" diff --git a/gemfiles/rails7.1.gemfile b/gemfiles/rails7.1.gemfile index 060c568..2b66085 100644 --- a/gemfiles/rails7.1.gemfile +++ b/gemfiles/rails7.1.gemfile @@ -1,4 +1,3 @@ eval_gemfile "common.rb" gem "rails", "~> 7.1.0" -gem "actionpack-action_caching" diff --git a/gemfiles/rails7.2.gemfile b/gemfiles/rails7.2.gemfile index 7410287..ff454e7 100644 --- a/gemfiles/rails7.2.gemfile +++ b/gemfiles/rails7.2.gemfile @@ -1,4 +1,3 @@ eval_gemfile "common.rb" gem "rails", "~> 7.2.0" -gem "actionpack-action_caching" diff --git a/gemfiles/rails8.0.gemfile b/gemfiles/rails8.0.gemfile index 101e19f..bc567db 100644 --- a/gemfiles/rails8.0.gemfile +++ b/gemfiles/rails8.0.gemfile @@ -1,4 +1,3 @@ eval_gemfile "common.rb" gem "rails", "~> 8.0.0" -gem "actionpack-action_caching" diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile index 0fe1ed5..b91b5ea 100644 --- a/gemfiles/rails_main.gemfile +++ b/gemfiles/rails_main.gemfile @@ -1,4 +1,3 @@ eval_gemfile "common.rb" gem "rails", github: "rails/rails", branch: "main" -gem "actionpack-action_caching" diff --git a/test/helper.rb b/test/helper.rb index 3201cef..cbbe69d 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -57,5 +57,4 @@ def setup end end -require "action_controller/action_caching" require "charcoal" diff --git a/test/jsonp_test.rb b/test/jsonp_test.rb index 2d03ec4..348b6f5 100644 --- a/test/jsonp_test.rb +++ b/test/jsonp_test.rb @@ -3,7 +3,6 @@ class JSONPControllerTester < ActionController::Base include Charcoal::JSONP - caches_action :test allow_jsonp :test def test