From 802249a33c1528cce4f2193e5df8971b72d759e9 Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Sat, 2 May 2020 20:17:07 +0200
Subject: [PATCH] ensure better logical grouping of build steps

---
 .circleci/config.yml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a63cecb..adb824c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,22 +10,31 @@ jobs:
       - setup_remote_docker
       - aws-cli/install
       - run:
-          name: Build and deploy to S3
+          name: Set build environment depending on branch
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              export SITEURL="https://www.offen.dev"
-              export BUCKET="offen-dev-production"
-              export DISTRIBUTION="E2UP8XHLFOC3QC"
-              export ROBOTS_FILE="robots.txt.production"
-              export OFFEN_ACCOUNT_ID="5ec8345a-2a45-4eb9-92e5-8d9e5684db58"
+              cat >> $BASH_ENV \<< EOF
+            export SITEURL="https://www.offen.dev"
+            export BUCKET="offen-dev-production"
+            export DISTRIBUTION="E2UP8XHLFOC3QC"
+            export ROBOTS_FILE="robots.txt.production"
+            export OFFEN_ACCOUNT_ID="5ec8345a-2a45-4eb9-92e5-8d9e5684db58"
+            EOF
             else
-              export SITEURL="https://staging.offen.dev"
-              export BUCKET="offen-dev-staging"
-              export DISTRIBUTION="E13I20LK8ASYFH"
-              export ROBOTS_FILE="robots.txt.staging"
-              export OFFEN_ACCOUNT_ID="8f7ee44a-4cd8-47f2-a77e-8c7c98d46b89"
+              cat >> $BASH_ENV \<< EOF
+            export SITEURL="https://staging.offen.dev"
+            export BUCKET="offen-dev-staging"
+            export DISTRIBUTION="E13I20LK8ASYFH"
+            export ROBOTS_FILE="robots.txt.staging"
+            export OFFEN_ACCOUNT_ID="8f7ee44a-4cd8-47f2-a77e-8c7c98d46b89"
+            EOF
             fi
-            make build
+      - run:
+          name: Build
+          command: make build
+      - run:
+          name: Deploy to S3
+          command: |
             aws s3 sync --delete ./output/. s3://$BUCKET
             aws cloudfront create-invalidation --distribution-id $DISTRIBUTION --paths "/*"