Apply changes from @gordonsyme

CircleCI-Public · Jul 17, 2017 · 27a807d · 27a807d
1 parent 2651f85
commit 27a807d
Showing 1 changed file with 5 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,23 +1,13 @@
 version: 2.0
 
 jobs:
-  checkout_code:
-    docker:
-      - image: circleci/ruby:2.4-node
-      - image: circleci/postgres:9.4.12-alpine
-    working_directory: /home/circleci/circleci-demo-workflows
-    steps:
-      - checkout
-      - persist_to_workspace:
-          root: .
-          paths: .
-
   bundle_dependencies:
     docker:
       - image: circleci/ruby:2.4-node
       - image: circleci/postgres:9.4.12-alpine
     working_directory: /home/circleci/circleci-demo-workflows
     steps:
+      - checkout
       - attach_workspace:
           at: /home/circleci/circleci-demo-workflows
       - restore_cache:
@@ -38,10 +28,9 @@ jobs:
       - image: circleci/postgres:9.4.12-alpine
     working_directory: /home/circleci/circleci-demo-workflows
     steps:
+      - checkout
       - attach_workspace:
           at: /home/circleci/circleci-demo-workflows
-      - attach_workspace:
-          at: vendor/bundle
       - run: bundle --path vendor/bundle
       - run: bundle exec rake db:create db:schema:load
       - run:
@@ -54,10 +43,9 @@ jobs:
       - image: circleci/postgres:9.4.12-alpine
     working_directory: /home/circleci/circleci-demo-workflows
     steps:
+      - checkout
       - attach_workspace:
           at: /home/circleci/circleci-demo-workflows
-      - attach_workspace:
-          at: vendor/bundle
       - run: bundle --path vendor/bundle
       - run:
           name: Precompile assets
@@ -73,12 +61,9 @@ jobs:
     environment:
       - HEROKU_APP: safe-wildwood-45845
     steps:
+      - checkout
       - attach_workspace:
           at: /home/circleci/circleci-demo-workflows
-      - attach_workspace:
-          at: vendor/bundle
-      - attach_workspace:
-          at: public/assets
       - run:
           name: Setup Heroku
           command: bash .circleci/setup-heroku.sh
@@ -93,20 +78,14 @@ workflows:
   version: 2
   build-and-deploy:
     jobs:
-      - checkout_code
-      - bundle_dependencies:
-          requires:
-            - checkout_code
+      - bundle_dependencies
       - rake_test:
           requires:
-            - checkout_code
             - bundle_dependencies
       - precompile_assets:
           requires:
-            - checkout_code
             - bundle_dependencies
       - deploy:
           requires:
-            - checkout_code
             - rake_test
             - precompile_assets