Few more hacks

FundingCircle · Apr 2, 2020 · 4a0fe16 · 4a0fe16
1 parent dc4cc7b
commit 4a0fe16
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,18 +1,11 @@
 version: 2
 
-defaults: &defaults
-  docker:
-    - image: circleci/ruby:2.7
-      environment:
-        RACK_ENV: test
-        VAULT_VERSION: 0.10.4
-
 aliases:
   environment: &environment
     RACK_ENV: test
     VAULT_VERSION: 0.10.4
+    BUNDLER_VERSION: 2.1.4
   command: &ruby-command |
-      gem update --system
       bundle check --path=vendor/bundle || bundle install --binstubs --jobs 4 --path=vendor/bundle --retry 3
       bundle exec rake app:db:create
       bundle exec rake app:db:schema:load
@@ -70,8 +63,7 @@ jobs:
     docker:
       - image: circleci/ruby:2.4
         environment:
-          RACK_ENV: test
-          VAULT_VERSION: 0.10.4
+          <<: *environment
     steps:
       - checkout
       - run: *install-vault
@@ -84,8 +76,7 @@ jobs:
     docker:
       - image: circleci/ruby:2.5
         environment:
-          RACK_ENV: test
-          VAULT_VERSION: 0.10.4
+          <<: *environment
     steps:
       - checkout
       - run: *install-vault
@@ -99,8 +90,7 @@ jobs:
     docker:
       - image: circleci/ruby:2.6
         environment:
-          RACK_ENV: test
-          VAULT_VERSION: 0.10.4
+          <<: *environment
     steps:
       - checkout
       - run: *install-vault
@@ -113,8 +103,7 @@ jobs:
     docker:
       - image: circleci/ruby:2.7
         environment:
-          RACK_ENV: test
-          VAULT_VERSION: 0.10.4
+          <<: *environment
     steps:
       - checkout
       - run: *install-vault
@@ -124,7 +113,10 @@ jobs:
       - run: *rails6
 
   publish-pre-release:
-    <<: *defaults
+    docker:
+      - image: circleci/ruby:2.7
+        environment:
+          <<: *environment
 
     steps:
       - checkout
@@ -155,7 +147,10 @@ jobs:
             gem push "$package" --host https://fundingcircle.jfrog.io/fundingcircle/api/gems/rubygems-pre-releases
 
   publish-release:
-    <<: *defaults
+    docker:
+      - image: circleci/ruby:2.7
+        environment:
+          <<: *environment
 
     steps:
       - checkout