Skip to content

Commit f5a9859

Browse files
authored
Revert "Add Gemfile.lock for different Ruby versions"
1 parent 762b781 commit f5a9859

16 files changed

+11
-1049
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,11 @@ jobs:
2929
with:
3030
bundler-cache: true
3131
ruby-version: ${{ matrix.ruby }}
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'
32+
- name: Test and Lint
5133
run: |
52-
BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rubocop
53-
34+
bundle install
35+
bundle exec rake
36+
bundle exec rubocop
5437
spec-live:
5538
name: Spec live
5639
if: github.repository == 'zendesk/zendesk_api_client_rb'
@@ -69,7 +52,7 @@ jobs:
6952
ruby-version: 3.1
7053
- name: spec:live
7154
run: |
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
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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ spec/fixtures/cassettes
44
spec/fixtures/credentials.yml
55
coverage/**
66
.yardoc/**
7+
Gemfile.lock
78
.ruby-version
89
vendor/bundle/**
910
pkg/**

common.rb renamed to Gemfile

File renamed without changes.

Gemfile.2.7

Lines changed: 0 additions & 1 deletion
This file was deleted.

Gemfile.2.7.lock

Lines changed: 0 additions & 162 deletions
This file was deleted.

Gemfile.3.0

Lines changed: 0 additions & 1 deletion
This file was deleted.

Gemfile.3.0.lock

Lines changed: 0 additions & 165 deletions
This file was deleted.

Gemfile.3.1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)