Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Add Gemfile.lock for different Ruby versions" #571

Merged
merged 1 commit into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 8 additions & 25 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,11 @@ jobs:
with:
bundler-cache: true
ruby-version: ${{ matrix.ruby }}

- name: Custom cache gems
uses: actions/cache@v2
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}-${{ matrix.ruby }}
restore-keys: |
${{ runner.os }}-gems-${{ matrix.ruby }}

- name: Install gems
run: |
BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle install --jobs 4 --retry 3 --path vendor/bundle

- name: Test
run: |
BUNDLE_GEMFILE=Gemfile.${{ matrix.ruby }} bundle exec rake

- name: Lint
if: matrix.ruby == '2.7'
- name: Test and Lint
run: |
BUNDLE_GEMFILE=Gemfile.2.7 bundle exec rubocop

bundle install
bundle exec rake
bundle exec rubocop
spec-live:
name: Spec live
if: github.repository == 'zendesk/zendesk_api_client_rb'
Expand All @@ -69,7 +52,7 @@ jobs:
ruby-version: 3.1
- name: spec:live
run: |
BUNDLE_GEMFILE=Gemfile.3.1 bundle install --jobs 4 --retry 3 --path vendor/bundle
BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rake clean_live set_ci_credentials spec:live ||
BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rake clean_live &&
BUNDLE_GEMFILE=Gemfile.3.1 bundle exec rspec spec/live --only-failures
bundle install
bundle exec rake clean_live set_ci_credentials spec:live ||
bundle exec rake clean_live &&
bundle exec rspec spec/live --only-failures
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ spec/fixtures/cassettes
spec/fixtures/credentials.yml
coverage/**
.yardoc/**
Gemfile.lock
.ruby-version
vendor/bundle/**
pkg/**
File renamed without changes.
1 change: 0 additions & 1 deletion Gemfile.2.7

This file was deleted.

162 changes: 0 additions & 162 deletions Gemfile.2.7.lock

This file was deleted.

1 change: 0 additions & 1 deletion Gemfile.3.0

This file was deleted.

165 changes: 0 additions & 165 deletions Gemfile.3.0.lock

This file was deleted.

1 change: 0 additions & 1 deletion Gemfile.3.1

This file was deleted.

Loading
Loading