Revert "Add Gemfile.lock for different Ruby versions"

zendesk · May 20, 2024 · f5a9859 · f5a9859
1 parent 762b781
commit f5a9859
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 1,049 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -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'
@@ -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
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ spec/fixtures/cassettes
 spec/fixtures/credentials.yml
 coverage/**
 .yardoc/**
+Gemfile.lock
 .ruby-version
 vendor/bundle/**
 pkg/**
diff --git a/common.rb → Gemfile b/common.rb → Gemfile
diff --git a/Gemfile.2.7 b/Gemfile.2.7
diff --git a/Gemfile.2.7.lock b/Gemfile.2.7.lock
diff --git a/Gemfile.3.0 b/Gemfile.3.0
diff --git a/Gemfile.3.0.lock b/Gemfile.3.0.lock
diff --git a/Gemfile.3.1 b/Gemfile.3.1