Skip to content

Commit b19eae1

Browse files
authored
Merge pull request #30 from pepabo/fix-error-on-activesupport-7
Fix error on activesupport 7
2 parents 1664bf4 + 3b75fca commit b19eae1

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,21 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
ruby: [2.5, 2.6, 2.7, 3.0]
10+
ruby: [2.7, 3.0, 3.1, 3.2]
11+
gemfile: ["active_support_6", "active_support_7"]
1112

1213
runs-on: ubuntu-latest
1314

15+
env:
16+
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
17+
1418
steps:
1519
- uses: actions/checkout@v2
1620

17-
- uses: ruby/setup-ruby@v1.64.1
21+
- uses: ruby/setup-ruby@v1
1822
with:
1923
ruby-version: ${{ matrix.ruby }}
2024
bundler-cache: true
25+
cache-version: ${{ matrix.gemfile }}
2126

2227
- run: bundle exec rspec

gemfiles/active_support_6.gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source 'https://rubygems.org'
2+
3+
gem 'activesupport', "~> 6.0"
4+
5+
# Specify your gem's dependencies in global_sign.gemspec
6+
gemspec path: '../'

gemfiles/active_support_7.gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source 'https://rubygems.org'
2+
3+
gem 'activesupport', "~> 7.0"
4+
5+
# Specify your gem's dependencies in global_sign.gemspec
6+
gemspec path: '../'

lib/global_sign.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
require 'active_support/core_ext/hash/conversions'
1+
require 'active_support'
2+
require 'active_support/core_ext'
23

34
require 'global_sign/version'
45
require 'global_sign/client'

0 commit comments

Comments
 (0)