Update gemfiles

cookpad · Sep 14, 2024 · 02b8d40 · 02b8d40
1 parent 50f1046
commit 02b8d40
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 132 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -16,9 +16,7 @@ env:
 jobs:
   integration_test:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./integration_test
+
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       MYSQL_HOST: 127.0.0.1

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -22,9 +22,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.3
-
-      - name: Install dependencies
-        run: bundle install
+          bundler-cache: true
 
       - name: Run RuboCop
         run: bundle exec rubocop
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -19,11 +19,6 @@ jobs:
         ruby-version:
           - 3.2
           - 3.3
-        gemfile:
-          - ar_6.1
-          - ar_7.0
-          - ar_7.1
-          - ar_7.2
 
     steps:
     - uses: actions/checkout@v2
@@ -32,7 +27,5 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
-    - name: Run tests with ${{ matrix.gemfile }}.gemfile on ruby-${{ matrix.ruby-version }}
+    - name: Run unit tests on ruby-${{ matrix.ruby-version }}
       run: bundle exec rspec spec/*_spec.rb
-      env:
-        BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
diff --git a/Gemfile b/Gemfile
@@ -4,11 +4,6 @@ gemspec
 
 gem 'rspec'
 gem 'appraisal'
+gem 'dotenv', require: 'dotenv/load'
 gem 'rubocop'
 gem 'rubocop-md'
-gem 'dotenv', require: 'dotenv/load'
-gem 'mysql2'
-gem 'pg'
-gem 'activerecord-sqlserver-adapter'
-gem 'sqlite3'
-gem 'trilogy'
diff --git a/gemfiles/ar_4.2.gemfile b/gemfiles/ar_4.2.gemfile
diff --git a/gemfiles/ar_5.2.gemfile b/gemfiles/ar_5.2.gemfile
diff --git a/gemfiles/ar_6.1.gemfile b/gemfiles/ar_6.1.gemfile
@@ -4,15 +4,11 @@ source "https://rubygems.org"
 
 gem "rspec"
 gem "appraisal"
+gem "dotenv", require: "dotenv/load"
 gem "rubocop"
 gem "rubocop-md"
-gem "dotenv", require: "dotenv/load"
-gem "mysql2"
-gem "pg"
-gem "activerecord-sqlserver-adapter"
-gem "sqlite3", "~> 1.4"
-gem "trilogy"
 gem "activerecord", "~> 6.1.0"
+gem "sqlite3", "~> 1.4"
 gem "bigdecimal"
 gem "base64"
 gem "mutex_m"

diff --git a/gemfiles/ar_7.0.gemfile b/gemfiles/ar_7.0.gemfile
@@ -4,15 +4,11 @@ source "https://rubygems.org"
 
 gem "rspec"
 gem "appraisal"
+gem "dotenv", require: "dotenv/load"
 gem "rubocop"
 gem "rubocop-md"
-gem "dotenv", require: "dotenv/load"
-gem "mysql2"
-gem "pg"
-gem "activerecord-sqlserver-adapter"
-gem "sqlite3", "~> 1.4"
-gem "trilogy"
 gem "activerecord", "~> 7.0.0"
+gem "sqlite3", "~> 1.4"
 gem "bigdecimal"
 gem "base64"
 gem "mutex_m"

diff --git a/gemfiles/ar_7.1.gemfile b/gemfiles/ar_7.1.gemfile
@@ -4,14 +4,9 @@ source "https://rubygems.org"
 
 gem "rspec"
 gem "appraisal"
+gem "dotenv", require: "dotenv/load"
 gem "rubocop"
 gem "rubocop-md"
-gem "dotenv", require: "dotenv/load"
-gem "mysql2"
-gem "pg"
-gem "activerecord-sqlserver-adapter"
-gem "sqlite3"
-gem "trilogy"
 gem "activerecord", "~> 7.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/ar_7.2.gemfile b/gemfiles/ar_7.2.gemfile
@@ -4,14 +4,9 @@ source "https://rubygems.org"
 
 gem "rspec"
 gem "appraisal"
+gem "dotenv", require: "dotenv/load"
 gem "rubocop"
 gem "rubocop-md"
-gem "dotenv", require: "dotenv/load"
-gem "mysql2"
-gem "pg"
-gem "activerecord-sqlserver-adapter"
-gem "sqlite3"
-gem "trilogy"
 gem "activerecord", "~> 7.2.0"
 
 gemspec path: "../"
diff --git a/integration_test/Appraisals b/integration_test/Appraisals
diff --git a/integration_test/Gemfile b/integration_test/Gemfile
diff --git a/integration_test/gemfiles/ar_6.1.gemfile b/integration_test/gemfiles/ar_6.1.gemfile
diff --git a/integration_test/gemfiles/ar_7.0.gemfile b/integration_test/gemfiles/ar_7.0.gemfile
diff --git a/integration_test/gemfiles/ar_7.1.gemfile b/integration_test/gemfiles/ar_7.1.gemfile
diff --git a/integration_test/gemfiles/ar_7.2.gemfile b/integration_test/gemfiles/ar_7.2.gemfile