From 00f6c3ce862f9f374a34ed20b5bc005f4bba0728 Mon Sep 17 00:00:00 2001
From: Nicolas Favre-Felix <n.favrefelix@gmail.com>
Date: Sun, 22 Mar 2020 19:22:56 -0700
Subject: [PATCH] Update CircleCI config

* Name various execution steps
* Split Ubuntu update from package install
* Add git install to allow local execution with CircleCI CLI
---
 .circleci/config.yml | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ee87dff..1c58b86 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,21 +8,32 @@ jobs:
     working_directory: ~/webdis
 
     steps:
+      # Ubuntu setup (git needed for local execution with circleci)
+      - run:
+          name : Ubuntu update and Git install
+          command: |
+            apt-get -y update &&
+            apt-get -y upgrade &&
+            apt-get -y --force-yes install git
+
       - checkout
 
-      # Build & run
-      - run: |
-          apt-get -y update &&
-          apt-get -y upgrade &&
-          apt-get -y --force-yes install wget make gcc libevent-dev libmsgpack-dev python2.7 &&
-          ln -s /usr/bin/python2.7 /usr/bin/python &&
-          make &&
-          sed -i -e 's/"daemonize":.*false,/"daemonize": true,/g' webdis.json &&
-          ./webdis webdis.json
+      - run:
+          name : Set up build environment
+          command: |
+            apt-get -y --force-yes install wget make gcc libevent-dev libmsgpack-dev python2.7 &&
+            ln -s /usr/bin/python2.7 /usr/bin/python
+
+      - run:
+          name: Build and run webdis
+          command: |
+            make &&
+            sed -i -e 's/"daemonize":.*false,/"daemonize": true,/g' webdis.json &&
+            ./webdis webdis.json
 
-      # Run tests
-      - run: |
-          ./tests/basic.py
+      - run:
+          name: Run tests
+          command: ./tests/basic.py
 
 workflows:
   version: 2