Merge remote-tracking branch 'origin/main' into thread-safety

.github/workflows/tests.yml

@@ -0,0 +1,106 @@
+name: tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ruby: "2.4"
+            rails: ~> 4.2.0
+            bundler: 1.17.3
+          - ruby: "2.4"
+            rails: ~> 5.0.0
+          - ruby: "2.4"
+            rails: ~> 5.1.0
+          - ruby: "2.4"
+            rails: ~> 5.2.0
+
+          - ruby: "2.5"
+            rails: ~> 5.0.0
+          - ruby: "2.5"
+            rails: ~> 5.1.0
+          - ruby: "2.5"
+            rails: ~> 5.2.0
+          - ruby: "2.5"
+            rails: ~> 6.0.0
+          - ruby: "2.5"
+            rails: ~> 6.1.0
+
+          - ruby: "2.6"
+            rails: ~> 5.0.0
+          - ruby: "2.6"
+            rails: ~> 5.1.0
+          - ruby: "2.6"
+            rails: ~> 5.2.0
+          - ruby: "2.6"
+            rails: ~> 6.0.0
+          - ruby: "2.6"
+            rails: ~> 6.1.0
+
+          - ruby: "2.7"
+            rails: ~> 5.0.0
+          - ruby: "2.7"
+            rails: ~> 5.1.0
+          - ruby: "2.7"
+            rails: ~> 5.2.0
+          - ruby: "2.7"
+            rails: ~> 6.0.0
+          - ruby: "2.7"
+            rails: ~> 6.1.0
+          - ruby: "2.7"
+            rails: ~> 7.0.0
+          - ruby: "2.7"
+            rails: ~> 7.1.0
+
+          - ruby: "3.0"
+            rails: ~> 6.0.0
+          - ruby: "3.0"
+            rails: ~> 6.1.0
+          - ruby: "3.0"
+            rails: ~> 7.0.0
+          - ruby: "3.0"
+            rails: ~> 7.1.0
+
+          - ruby: "3.1"
+            rails: ~> 6.0.0
+          - ruby: "3.1"
+            rails: ~> 6.1.0
+          - ruby: "3.1"
+            rails: ~> 7.0.0
+          - ruby: "3.1"
+            rails: ~> 7.1.0
+          - ruby: "3.1"
+            rails: edge
+
+          - ruby: "3.2"
+            rails: ~> 6.0.0
+          - ruby: "3.2"
+            rails: ~> 6.1.0
+          - ruby: "3.2"
+            rails: ~> 7.0.0
+          - ruby: "3.2"
+            rails: ~> 7.1.0
+          - ruby: "3.2"
+            rails: edge
+
+          - ruby: head
+            rails: ~> 7.1.0
+          - ruby: head
+            rails: edge
+
+    env:
+      RAILS_VERSION: ${{ matrix.rails }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler: ${{ matrix.bundler }}
+    - name: Run bundle update
+      run: bundle update
+    - name: Run tests
+      run: bin/rake

Gemfile

@@ -1,11 +1,12 @@
 source "https://rubygems.org"
 
-# rubocop:disable Bundler/DuplicatedGem
-if ENV["RAILS_VERSION"]
-  gem "rails", ENV["RAILS_VERSION"]
-elsif ENV["RAILS_BRANCH"]
-  gem "rails", git: "https://github.com/rails/rails.git", branch: ENV["RAILS_BRANCH"]
+if ENV["RAILS_VERSION"] == "edge"
+  gem "rails", git: "https://github.com/rails/rails.git", branch: "main"
+end
+
+# Lock loofah to old version for Ruby 2.4
+unless RUBY_VERSION > "2.5"
+  gem "loofah", "~> 2.20.0"
 end
-# rubocop:enable Bundler/DuplicatedGem
 
 gemspec

README.md

@@ -5,8 +5,6 @@ Forgery on the request phase when using OmniAuth gem with a Ruby on Rails
 application) by implementing a CSRF token verifier that directly uses
 `ActionController::RequestForgeryProtection` code from Rails.
 
-[![CircleCI](https://circleci.com/gh/cookpad/omniauth-rails_csrf_protection/tree/main.svg?style=svg)](https://circleci.com/gh/cookpad/omniauth-rails_csrf_protection/tree/main)
-
 [CVE-2015-9284]: https://nvd.nist.gov/vuln/detail/CVE-2015-9284
 
 ## Usage