name

onemedical · Jan 4, 2024 · 60f79bc · 60f79bc
1 parent 38dbc17
commit 60f79bc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,11 +7,11 @@ _references:
       - "3.2.2"
       - "3.1.4"
       - "3.0.6"
-  rails_versions: &rails_versions
-    rails-version:
-      - "~> 7.1.0"
-      - "~> 7.0.0"
-      - "~> 6.1.0"
+  rails_version_prefixess: &rails_version_prefixes
+    rails-version-prefix:
+      - "7.1"
+      - "7.0"
+      - "6.1"
       - "main"
 
 orbs:
@@ -22,14 +22,14 @@ jobs:
     parameters:
       ruby-version:
         type: string
-      rails-version:
+      rails-version-prefix:
         type: string
 
     executor:
       name: ruby/default
       tag: <<parameters.ruby-version>>
     environment:
-      RAILS_VERSION: <<parameters.rails-version>>
+      RAILS_VERSION_PREFIX: <<parameters.rails-version-prefix>>
     steps:
       - checkout
       - ruby/install-deps:
@@ -42,12 +42,12 @@ jobs:
       - ruby/rspec-test
   test-ruby-head:
     parameters:
-      rails-version:
+      rails-version-prefix:
         type: string
     docker:
       - image: cimg/base:stable
     environment:
-      RAILS_VERSION: <<parameters.rails-version>>
+      RAILS_VERSION: <<parameters.rails-version-prefix>>
     steps:
       - checkout
       - ruby/install:
@@ -83,14 +83,16 @@ workflows:
   test:
     jobs:
       - test:
+          name: "test-ruby-<<matrix.ruby-version>>-rails-<<matrix.rails-version-prefix>>"
           matrix:
             parameters:
               <<: *ruby_versions
-              <<: *rails_versions
+              <<: *rails_version_prefixes
             exclude:
               - ruby-version: 3.0.6
-                rails-version: main
+                rails-version-prefix: main
       - test-ruby-head:
+          name: "test-ruby-head-rails-<<matrix.rails-version-prefix>>"
           matrix:
             parameters:
-              <<: *rails_versions
+              <<: *rails_version_prefixes
diff --git a/Gemfile b/Gemfile
@@ -3,13 +3,13 @@ source 'https://rubygems.org'
 gemspec
 
 # Lock Rails down in the matrix build, but not by default
-rails_version = ENV.fetch("RAILS_VERSION", nil)
-if rails_version == "main"
+rails_version_prefix = ENV.fetch("RAILS_VERSION_PREFIX", nil)
+if rails_version_prefix == "main"
   gem "activesupport", github: "rails/rails", branch: "main"
   gem "activerecord", github: "rails/rails", branch: "main"
   gem "railties", github: "rails/rails", branch: "main"
-elsif rails_version
-  gem "activesupport", rails_version
-  gem "activerecord", rails_version
-  gem "railties", rails_version
+elsif rails_version_prefix
+  gem "activesupport", "~> #{rails_version_prefix}.0"
+  gem "activerecord", "~> #{rails_version_prefix}.0"
+  gem "railties", "~> #{rails_version_prefix}.0"
 end