ci: Drop gemfile.locks and stabilize the CI (preparation for graphql-2.3.) compatibility

.circleci/config.yml

@@ -6,25 +6,17 @@ orbs:
 commands:
   bundle-install:
     steps:
-      - run:
-          name: Configure Bundler
-          command: |
-            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
-            source $BASH_ENV
-            gem install bundler
       - restore_cache:
           name: Restore Ruby Package Cache
           keys:
-            - v6-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
-            - v6-gem-cache-{{ arch }}-{{ .Branch }}-
-            - v6-gem-cache-{{ arch }}-
+            - v6-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "apollo-federation.gemspec" }}-{{ checksum "Gemfile" }}
       - run:
           name: Install base Ruby dependencies
           command: |
             bundle install --jobs=1 --retry=3 --path=vendor/bundle
       - save_cache:
           name: Save Ruby Package Cache
-          key: v6-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+          key: v6-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "apollo-federation.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - ./vendor/bundle
   appraisal-install:
@@ -33,22 +25,22 @@ commands:
         type: string
     steps:
       - run:
-          name: Copy lockfile
+          name: Copy current appraisal gemspec
           command: |
-            bundle exec appraisal << parameters.appraisal >>  "cp \$BUNDLE_GEMFILE.lock current_appraisal.gemfile.lock"
+            bundle exec appraisal << parameters.appraisal >>  "cp \$BUNDLE_GEMFILE current_appraisal.gemfile"
       - restore_cache:
           name: Restore Appraisal package cache
           keys:
-            - v6-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "current_appraisal.gemfile.lock" }}
-            - v6-gem-cache-{{ arch }}-{{ .Branch }}-
-            - v6-gem-cache-{{ arch }}-
+            - v6-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "apollo-federation.gemspec" }}-{{ checksum "current_appraisal.gemfile" }}
       - run:
           name: Install appraisal dependencies
+          # Appraisal by default will install dependencies under `gemfiles/vendor/bundle`, so if we want
+          # to have them under `vendor/bundle` we need to specify `../vendor/bundle`
           command: |
             bundle exec appraisal << parameters.appraisal >> bundle install --jobs=1 --retry=3 --path=../vendor/bundle
       - save_cache:
           name: Save Appraisal package cache
-          key: v6-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "current_appraisal.gemfile.lock" }}
+          key: v6-gem-cache-{{ arch }}-{{ .Branch }}-{{ checksum "apollo-federation.gemspec" }}-{{ checksum "current_appraisal.gemfile" }}
           paths:
             - ./vendor/bundle
 
@@ -96,7 +88,14 @@ jobs:
       - appraisal-install:
           appraisal: << parameters.appraisal >>
       - gusto/yarn-install
-      - run: bundle exec appraisal << parameters.appraisal >> yarn test
+      - run: bundle config set path './vendor/bundle'
+      # Tell appraisal to use the common cache under `vendor/bundle` in the main directory
+      # instead of `gemfiles/vendor/bundle`:
+      - run: bundle exec appraisal bundle config set path '../vendor/bundle'
+      # Sometimes graphql servers aren't getting closed quickly enough on CI.
+      # We don't care about it as long as the tests pass.
+      # Let's quit as soon as the tests pass by using `forceExit` flag.
+      - run: bundle exec appraisal << parameters.appraisal >> yarn test --forceExit
       - run: yarn lint
   release:
     docker:

.gitignore

@@ -9,3 +9,6 @@ node_modules/
 .circleci/processed-config.yml
 
 .DS_Store
+
+Gemfile.lock
+gemfiles/*.gemfile.lock

.ruby-version

@@ -1 +1 @@
-2.7.5
+3.2.0

Appraisals

@@ -17,5 +17,5 @@ appraise 'graphql-1.13' do
 end
 
 appraise 'graphql-2.0' do
-  gem 'graphql', '~> 2.0'
+  gem 'graphql', '2.0.19'
 end

Gemfile

@@ -3,7 +3,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-# Fixes an issue in ruby 3.2, remove when a new version is published
-gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal', ref: 'ea2baff57bc7f9e5f9e7a648916c9ae536325116'
-gem 'graphql', '~> 2.0.0'

apollo-federation.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'debase', '0.2.5.beta2'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rack'
+  spec.add_development_dependency 'rack', '~> 2.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop', '~> 0.75.0'