Skip to content

Commit e4a10e6

Browse files
JinHuangMelbJinHuangMelb
authored
Merge pull request #566 from zendesk/jin.huang/add-gemfile-lock-file
Add Gemfile.lock for different Ruby versions
2 parents 36f5a13 + 5e3d675 commit e4a10e6

16 files changed

+1049
-11
lines changed

‎.github/workflows/main.yml‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,28 @@ jobs:
2929
with:
3030
bundler-cache: true
3131
ruby-version: ${{ matrix.ruby }}
32-
- name: Test and Lint
32+
33+
- name: Custom cache gems
34+
uses: actions/cache@v2
35+
with:
36+
path: vendor/bundle
37+
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-${{ matrix.ruby }}
38+
restore-keys: |
39+
${{ runner.os }}-gems-${{ matrix.ruby }}
40+
41+
- name: Install gems
42+
run: |
43+
BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle install --jobs 4 --retry 3 --path vendor/bundle
44+
45+
- name: Test
46+
run: |
47+
BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle exec rake
48+
49+
- name: Lint
50+
if: matrix.ruby == '2.7'
3351
run: |
34-
bundle install
35-
bundle exec rake
36-
bundle exec rubocop
52+
BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rubocop
53+
3754
spec-live:
3855
name: Spec live
3956
if: github.repository == 'zendesk/zendesk_api_client_rb'
@@ -52,7 +69,7 @@ jobs:
5269
ruby-version: 3.1
5370
- name: spec:live
5471
run: |
55-
bundle install
56-
bundle exec rake clean_live set_ci_credentials spec:live ||
57-
bundle exec rake clean_live &&
58-
bundle exec rspec spec/live --only-failures
72+
BUNDLE_GEMFILE=Gemfile.3.1 bundle install --jobs 4 --retry 3 --path vendor/bundle
73+
BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rake clean_live set_ci_credentials spec:live ||
74+
BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rake clean_live &&
75+
BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rspec spec/live --only-failures

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ spec/fixtures/cassettes
44
spec/fixtures/credentials.yml
55
coverage/**
66
.yardoc/**
7-
Gemfile.lock
87
.ruby-version
98
vendor/bundle/**
109
pkg/**

‎Gemfile.2.7‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eval_gemfile('common.rb')

‎Gemfile.2.7.lock‎

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
PATH
2+
remote: .
3+
specs:
4+
zendesk_api (3.0.5)
5+
faraday (> 2.0.0)
6+
faraday-multipart
7+
hashie (>= 3.5.2, < 6.0.0)
8+
inflection
9+
mini_mime
10+
multipart-post (~> 2.0)
11+
12+
GEM
13+
remote: https://rubygems.org/
14+
specs:
15+
actionpack (7.1.3.2)
16+
actionview (= 7.1.3.2)
17+
activesupport (= 7.1.3.2)
18+
nokogiri (>= 1.8.5)
19+
racc
20+
rack (>= 2.2.4)
21+
rack-session (>= 1.0.1)
22+
rack-test (>= 0.6.3)
23+
rails-dom-testing (~> 2.2)
24+
rails-html-sanitizer (~> 1.6)
25+
actionview (7.1.3.2)
26+
activesupport (= 7.1.3.2)
27+
builder (~> 3.1)
28+
erubi (~> 1.11)
29+
rails-dom-testing (~> 2.2)
30+
rails-html-sanitizer (~> 1.6)
31+
activesupport (7.1.3.2)
32+
base64
33+
bigdecimal
34+
concurrent-ruby (~> 1.0, >= 1.0.2)
35+
connection_pool (>= 2.2.5)
36+
drb
37+
i18n (>= 1.6, < 2)
38+
minitest (>= 5.1)
39+
mutex_m
40+
tzinfo (~> 2.0)
41+
addressable (2.8.6)
42+
public_suffix (>= 2.0.2, < 6.0)
43+
ast (2.4.2)
44+
base64 (0.2.0)
45+
bigdecimal (3.1.8)
46+
builder (3.2.4)
47+
bump (0.10.0)
48+
byebug (11.1.3)
49+
concurrent-ruby (1.2.3)
50+
connection_pool (2.4.1)
51+
crack (1.0.0)
52+
bigdecimal
53+
rexml
54+
crass (1.0.6)
55+
diff-lcs (1.5.1)
56+
drb (2.2.1)
57+
erubi (1.12.0)
58+
faraday (2.8.1)
59+
base64
60+
faraday-net_http (>= 2.0, < 3.1)
61+
ruby2_keywords (>= 0.0.4)
62+
faraday-multipart (1.0.4)
63+
multipart-post (~> 2)
64+
faraday-net_http (3.0.2)
65+
hashdiff (1.1.0)
66+
hashie (5.0.0)
67+
i18n (1.14.5)
68+
concurrent-ruby (~> 1.0)
69+
inflection (1.0.0)
70+
jaro_winkler (1.5.6)
71+
json (2.7.2)
72+
loofah (2.22.0)
73+
crass (~> 1.0.2)
74+
nokogiri (>= 1.12.0)
75+
mini_mime (1.1.5)
76+
mini_portile2 (2.8.6)
77+
minitest (5.22.3)
78+
multipart-post (2.4.1)
79+
mutex_m (0.2.0)
80+
nokogiri (1.15.6)
81+
mini_portile2 (~> 2.8.2)
82+
racc (~> 1.4)
83+
parallel (1.24.0)
84+
parser (3.3.1.0)
85+
ast (~> 2.4.1)
86+
racc
87+
public_suffix (5.0.5)
88+
racc (1.7.3)
89+
rack (3.0.10)
90+
rack-session (2.0.0)
91+
rack (>= 3.0.0)
92+
rack-test (2.1.0)
93+
rack (>= 1.3)
94+
rails-dom-testing (2.2.0)
95+
activesupport (>= 5.0.0)
96+
minitest
97+
nokogiri (>= 1.6)
98+
rails-html-sanitizer (1.6.0)
99+
loofah (~> 2.21)
100+
nokogiri (~> 1.14)
101+
rainbow (3.1.1)
102+
rake (13.2.1)
103+
rexml (3.2.6)
104+
rspec (3.10.0)
105+
rspec-core (~> 3.10.0)
106+
rspec-expectations (~> 3.10.0)
107+
rspec-mocks (~> 3.10.0)
108+
rspec-core (3.10.1)
109+
rspec-support (~> 3.10.0)
110+
rspec-expectations (3.10.2)
111+
diff-lcs (>= 1.2.0, < 2.0)
112+
rspec-support (~> 3.10.0)
113+
rspec-mocks (3.10.2)
114+
diff-lcs (>= 1.2.0, < 2.0)
115+
rspec-support (~> 3.10.0)
116+
rspec-support (3.10.3)
117+
rubocop (0.79.0)
118+
jaro_winkler (~> 1.5.1)
119+
parallel (~> 1.10)
120+
parser (>= 2.7.0.1)
121+
rainbow (>= 2.2.2, < 4.0)
122+
ruby-progressbar (~> 1.7)
123+
unicode-display_width (>= 1.4.0, < 1.7)
124+
ruby-progressbar (1.13.0)
125+
ruby2_keywords (0.0.5)
126+
scrub_rb (1.0.1)
127+
tzinfo (2.0.6)
128+
concurrent-ruby (~> 1.0)
129+
unicode-display_width (1.6.1)
130+
vcr (6.2.0)
131+
webmock (3.23.0)
132+
addressable (>= 2.8.0)
133+
crack (>= 0.3.2)
134+
hashdiff (>= 0.4.0, < 2.0.0)
135+
yard (0.9.36)
136+
137+
PLATFORMS
138+
ruby
139+
140+
DEPENDENCIES
141+
actionpack (>= 5.2.4.6)
142+
addressable (>= 2.8.0)
143+
bump
144+
byebug
145+
jruby-openssl
146+
json (>= 2.3.0)
147+
mini_mime
148+
rake
149+
rspec (= 3.10.0)
150+
rspec-core (= 3.10.1)
151+
rspec-expectations (= 3.10.2)
152+
rspec-mocks (= 3.10.2)
153+
rspec-support (= 3.10.3)
154+
rubocop (~> 0.79.0)
155+
scrub_rb
156+
vcr (~> 6.0)
157+
webmock
158+
yard
159+
zendesk_api!
160+
161+
BUNDLED WITH
162+
2.1.4

‎Gemfile.3.0‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eval_gemfile('common.rb')

‎Gemfile.3.0.lock‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
PATH
2+
remote: .
3+
specs:
4+
zendesk_api (3.0.5)
5+
faraday (> 2.0.0)
6+
faraday-multipart
7+
hashie (>= 3.5.2, < 6.0.0)
8+
inflection
9+
mini_mime
10+
multipart-post (~> 2.0)
11+
12+
GEM
13+
remote: https://rubygems.org/
14+
specs:
15+
actionpack (7.1.3.2)
16+
actionview (= 7.1.3.2)
17+
activesupport (= 7.1.3.2)
18+
nokogiri (>= 1.8.5)
19+
racc
20+
rack (>= 2.2.4)
21+
rack-session (>= 1.0.1)
22+
rack-test (>= 0.6.3)
23+
rails-dom-testing (~> 2.2)
24+
rails-html-sanitizer (~> 1.6)
25+
actionview (7.1.3.2)
26+
activesupport (= 7.1.3.2)
27+
builder (~> 3.1)
28+
erubi (~> 1.11)
29+
rails-dom-testing (~> 2.2)
30+
rails-html-sanitizer (~> 1.6)
31+
activesupport (7.1.3.2)
32+
base64
33+
bigdecimal
34+
concurrent-ruby (~> 1.0, >= 1.0.2)
35+
connection_pool (>= 2.2.5)
36+
drb
37+
i18n (>= 1.6, < 2)
38+
minitest (>= 5.1)
39+
mutex_m
40+
tzinfo (~> 2.0)
41+
addressable (2.8.6)
42+
public_suffix (>= 2.0.2, < 6.0)
43+
ast (2.4.2)
44+
base64 (0.2.0)
45+
bigdecimal (3.1.8)
46+
builder (3.2.4)
47+
bump (0.10.0)
48+
byebug (11.1.3)
49+
concurrent-ruby (1.2.3)
50+
connection_pool (2.4.1)
51+
crack (1.0.0)
52+
bigdecimal
53+
rexml
54+
crass (1.0.6)
55+
diff-lcs (1.5.1)
56+
drb (2.2.1)
57+
erubi (1.12.0)
58+
faraday (2.9.0)
59+
faraday-net_http (>= 2.0, < 3.2)
60+
faraday-multipart (1.0.4)
61+
multipart-post (~> 2)
62+
faraday-net_http (3.1.0)
63+
net-http
64+
hashdiff (1.1.0)
65+
hashie (5.0.0)
66+
i18n (1.14.5)
67+
concurrent-ruby (~> 1.0)
68+
inflection (1.0.0)
69+
json (2.7.2)
70+
loofah (2.22.0)
71+
crass (~> 1.0.2)
72+
nokogiri (>= 1.12.0)
73+
mini_mime (1.1.5)
74+
minitest (5.22.3)
75+
multipart-post (2.4.1)
76+
mutex_m (0.2.0)
77+
net-http (0.4.1)
78+
uri
79+
nokogiri (1.16.4-arm64-darwin)
80+
racc (~> 1.4)
81+
parallel (1.24.0)
82+
parser (3.3.1.0)
83+
ast (~> 2.4.1)
84+
racc
85+
public_suffix (5.0.5)
86+
racc (1.7.3)
87+
rack (3.0.10)
88+
rack-session (2.0.0)
89+
rack (>= 3.0.0)
90+
rack-test (2.1.0)
91+
rack (>= 1.3)
92+
rails-dom-testing (2.2.0)
93+
activesupport (>= 5.0.0)
94+
minitest
95+
nokogiri (>= 1.6)
96+
rails-html-sanitizer (1.6.0)
97+
loofah (~> 2.21)
98+
nokogiri (~> 1.14)
99+
rainbow (3.1.1)
100+
rake (13.2.1)
101+
regexp_parser (2.9.0)
102+
rexml (3.2.6)
103+
rspec (3.10.0)
104+
rspec-core (~> 3.10.0)
105+
rspec-expectations (~> 3.10.0)
106+
rspec-mocks (~> 3.10.0)
107+
rspec-core (3.10.1)
108+
rspec-support (~> 3.10.0)
109+
rspec-expectations (3.10.2)
110+
diff-lcs (>= 1.2.0, < 2.0)
111+
rspec-support (~> 3.10.0)
112+
rspec-mocks (3.10.2)
113+
diff-lcs (>= 1.2.0, < 2.0)
114+
rspec-support (~> 3.10.0)
115+
rspec-support (3.10.3)
116+
rubocop (1.13.0)
117+
parallel (~> 1.10)
118+
parser (>= 3.0.0.0)
119+
rainbow (>= 2.2.2, < 4.0)
120+
regexp_parser (>= 1.8, < 3.0)
121+
rexml
122+
rubocop-ast (>= 1.2.0, < 2.0)
123+
ruby-progressbar (~> 1.7)
124+
unicode-display_width (>= 1.4.0, < 3.0)
125+
rubocop-ast (1.31.3)
126+
parser (>= 3.3.1.0)
127+
ruby-progressbar (1.13.0)
128+
scrub_rb (1.0.1)
129+
tzinfo (2.0.6)
130+
concurrent-ruby (~> 1.0)
131+
unicode-display_width (2.5.0)
132+
uri (0.13.0)
133+
vcr (6.2.0)
134+
webmock (3.23.0)
135+
addressable (>= 2.8.0)
136+
crack (>= 0.3.2)
137+
hashdiff (>= 0.4.0, < 2.0.0)
138+
yard (0.9.36)
139+
140+
PLATFORMS
141+
arm64-darwin-23
142+
143+
DEPENDENCIES
144+
actionpack (>= 5.2.4.6)
145+
addressable (>= 2.8.0)
146+
bump
147+
byebug
148+
jruby-openssl
149+
json (>= 2.3.0)
150+
mini_mime
151+
rake
152+
rspec (= 3.10.0)
153+
rspec-core (= 3.10.1)
154+
rspec-expectations (= 3.10.2)
155+
rspec-mocks (= 3.10.2)
156+
rspec-support (= 3.10.3)
157+
rubocop (~> 1.13.0)
158+
scrub_rb
159+
vcr (~> 6.0)
160+
webmock
161+
yard
162+
zendesk_api!
163+
164+
BUNDLED WITH
165+
2.2.33

‎Gemfile.3.1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
eval_gemfile('common.rb')

0 commit comments

Comments
 (0)