Skip to content

Commit 0f72e59

Browse files
maths22maths22
authored
Merge pull request #38 from instructure/rails-71
Support rails 7.1 and modernize build
2 parents 5a6344c + cfd631d commit 0f72e59

17 files changed

+424
-298
lines changed

‎.github/workflows/push.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Continuous Integration
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
ruby-version: [2.7, "3.0", 3.1, 3.2]
17+
lockfile: ['Gemfile.activerecord-6.1.lock', 'Gemfile.activerecord-7.0.lock', 'Gemfile.activerecord-7.1.lock']
18+
19+
steps:
20+
- uses: actions/checkout@v3
21+
- name: Set up Ruby
22+
uses: ruby/setup-ruby@v1
23+
with:
24+
ruby-version: ${{ matrix.ruby-version }}
25+
bundler-cache: true
26+
- name: Run tests
27+
run: bundle check
28+
env:
29+
BUNDLE_LOCKFILE: ${{ matrix.lockfile }}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/.byebug_history
22
/*.gem
3+
/.bundle

‎.travis.yml

-13
This file was deleted.

‎Appraisals

-11
This file was deleted.

‎Gemfile

+21
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,23 @@
11
source 'https://rubygems.org/'
2+
3+
plugin "bundler-multilock", "1.0.11"
4+
return unless Plugin.installed?("bundler-multilock")
5+
6+
Plugin.send(:load_plugin, "bundler-multilock")
7+
28
gemspec
9+
10+
lockfile "activerecord-6.1" do
11+
gem "activerecord", "~> 6.1.0"
12+
gem "railties", "~> 6.1.0"
13+
end
14+
15+
lockfile "activerecord-7.0" do
16+
gem "activerecord", "~> 7.0.0"
17+
gem "railties", "~> 7.0.0"
18+
end
19+
20+
lockfile "activerecord-7.1" do
21+
gem "activerecord", "~> 7.1.0"
22+
gem "railties", "~> 7.1.0"
23+
end

‎Gemfile.activerecord-6.1.lock

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
PATH
2+
remote: .
3+
specs:
4+
guardrail (3.0.3)
5+
activerecord (>= 6.1, < 7.2)
6+
railties (>= 6.1, < 7.2)
7+
8+
GEM
9+
remote: https://rubygems.org/
10+
specs:
11+
actionpack (6.1.7.6)
12+
actionview (= 6.1.7.6)
13+
activesupport (= 6.1.7.6)
14+
rack (~> 2.0, >= 2.0.9)
15+
rack-test (>= 0.6.3)
16+
rails-dom-testing (~> 2.0)
17+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
18+
actionview (6.1.7.6)
19+
activesupport (= 6.1.7.6)
20+
builder (~> 3.1)
21+
erubi (~> 1.4)
22+
rails-dom-testing (~> 2.0)
23+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
24+
activemodel (6.1.7.6)
25+
activesupport (= 6.1.7.6)
26+
activerecord (6.1.7.6)
27+
activemodel (= 6.1.7.6)
28+
activesupport (= 6.1.7.6)
29+
activesupport (6.1.7.6)
30+
concurrent-ruby (~> 1.0, >= 1.0.2)
31+
i18n (>= 1.6, < 2)
32+
minitest (>= 5.1)
33+
tzinfo (~> 2.0)
34+
zeitwerk (~> 2.3)
35+
builder (3.2.4)
36+
concurrent-ruby (1.2.2)
37+
crass (1.0.6)
38+
debug (1.8.0)
39+
irb (>= 1.5.0)
40+
reline (>= 0.3.1)
41+
erubi (1.12.0)
42+
i18n (1.14.1)
43+
concurrent-ruby (~> 1.0)
44+
io-console (0.6.0)
45+
irb (1.8.1)
46+
rdoc
47+
reline (>= 0.3.8)
48+
loofah (2.21.3)
49+
crass (~> 1.0.2)
50+
nokogiri (>= 1.12.0)
51+
method_source (1.0.0)
52+
mini_portile2 (2.8.4)
53+
minitest (5.20.0)
54+
nokogiri (1.15.4)
55+
mini_portile2 (~> 2.8.2)
56+
racc (~> 1.4)
57+
psych (5.1.0)
58+
stringio
59+
racc (1.7.1)
60+
rack (2.2.8)
61+
rack-test (2.1.0)
62+
rack (>= 1.3)
63+
rails-dom-testing (2.2.0)
64+
activesupport (>= 5.0.0)
65+
minitest
66+
nokogiri (>= 1.6)
67+
rails-html-sanitizer (1.6.0)
68+
loofah (~> 2.21)
69+
nokogiri (~> 1.14)
70+
railties (6.1.7.6)
71+
actionpack (= 6.1.7.6)
72+
activesupport (= 6.1.7.6)
73+
method_source
74+
rake (>= 12.2)
75+
thor (~> 1.0)
76+
rake (13.0.6)
77+
rdoc (6.5.0)
78+
psych (>= 4.0.0)
79+
reline (0.3.9)
80+
io-console (~> 0.5)
81+
stringio (3.0.8)
82+
thor (1.2.2)
83+
tzinfo (2.0.6)
84+
concurrent-ruby (~> 1.0)
85+
zeitwerk (2.6.12)
86+
87+
PLATFORMS
88+
ruby
89+
90+
DEPENDENCIES
91+
activerecord (~> 6.1.0)
92+
debug
93+
guardrail!
94+
railties (~> 6.1.0)
95+
96+
BUNDLED WITH
97+
2.4.19

‎Gemfile.activerecord-7.0.lock

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
PATH
2+
remote: .
3+
specs:
4+
guardrail (3.0.3)
5+
activerecord (>= 6.1, < 7.2)
6+
railties (>= 6.1, < 7.2)
7+
8+
GEM
9+
remote: https://rubygems.org/
10+
specs:
11+
actionpack (7.0.8)
12+
actionview (= 7.0.8)
13+
activesupport (= 7.0.8)
14+
rack (~> 2.0, >= 2.2.4)
15+
rack-test (>= 0.6.3)
16+
rails-dom-testing (~> 2.0)
17+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
18+
actionview (7.0.8)
19+
activesupport (= 7.0.8)
20+
builder (~> 3.1)
21+
erubi (~> 1.4)
22+
rails-dom-testing (~> 2.0)
23+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
24+
activemodel (7.0.8)
25+
activesupport (= 7.0.8)
26+
activerecord (7.0.8)
27+
activemodel (= 7.0.8)
28+
activesupport (= 7.0.8)
29+
activesupport (7.0.8)
30+
concurrent-ruby (~> 1.0, >= 1.0.2)
31+
i18n (>= 1.6, < 2)
32+
minitest (>= 5.1)
33+
tzinfo (~> 2.0)
34+
builder (3.2.4)
35+
concurrent-ruby (1.2.2)
36+
crass (1.0.6)
37+
debug (1.8.0)
38+
irb (>= 1.5.0)
39+
reline (>= 0.3.1)
40+
erubi (1.12.0)
41+
i18n (1.14.1)
42+
concurrent-ruby (~> 1.0)
43+
io-console (0.6.0)
44+
irb (1.8.1)
45+
rdoc
46+
reline (>= 0.3.8)
47+
loofah (2.21.3)
48+
crass (~> 1.0.2)
49+
nokogiri (>= 1.12.0)
50+
method_source (1.0.0)
51+
mini_portile2 (2.8.4)
52+
minitest (5.20.0)
53+
nokogiri (1.15.4)
54+
mini_portile2 (~> 2.8.2)
55+
racc (~> 1.4)
56+
psych (5.1.0)
57+
stringio
58+
racc (1.7.1)
59+
rack (2.2.8)
60+
rack-test (2.1.0)
61+
rack (>= 1.3)
62+
rails-dom-testing (2.2.0)
63+
activesupport (>= 5.0.0)
64+
minitest
65+
nokogiri (>= 1.6)
66+
rails-html-sanitizer (1.6.0)
67+
loofah (~> 2.21)
68+
nokogiri (~> 1.14)
69+
railties (7.0.8)
70+
actionpack (= 7.0.8)
71+
activesupport (= 7.0.8)
72+
method_source
73+
rake (>= 12.2)
74+
thor (~> 1.0)
75+
zeitwerk (~> 2.5)
76+
rake (13.0.6)
77+
rdoc (6.5.0)
78+
psych (>= 4.0.0)
79+
reline (0.3.9)
80+
io-console (~> 0.5)
81+
stringio (3.0.8)
82+
thor (1.2.2)
83+
tzinfo (2.0.6)
84+
concurrent-ruby (~> 1.0)
85+
zeitwerk (2.6.12)
86+
87+
PLATFORMS
88+
ruby
89+
90+
DEPENDENCIES
91+
activerecord (~> 7.0.0)
92+
debug
93+
guardrail!
94+
railties (~> 7.0.0)
95+
96+
BUNDLED WITH
97+
2.4.19

0 commit comments

Comments
 (0)