Merge pull request #148 from CircleCI-Public/reset-homebrew

[CIRCLE-14156] Homebrew deploy should bump from latest version

.circleci/brew-deploy.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# Remove the original circleci-agent from /usr/local/bin for homebrew
+rm /usr/local/bin/circleci
+# Install the latest circleci from homebrew
+brew install circleci
+
+VERSION=$(./dist/darwin_amd64/circleci version)
+TAG="v$(ruby -e "puts '$VERSION'.split('+')[0]")"
+REVISION=$(git rev-parse "$(ruby -e "puts '$VERSION'.split('+')[1]")")
+echo "Bumping circleci to $TAG+$REVISION"
+brew bump-formula-pr --strict \
+  --tag="$TAG" \
+  --revision="$CIRCLE_SHA1" \
+  circleci
+

.circleci/config.yml

@@ -148,15 +148,7 @@ jobs:
           git config --global user.email "$GH_EMAIL" > /dev/null 2>&1
           git config --global user.name "$GH_NAME" > /dev/null 2>&1
       - run: brew --version
-      - run: |
-          export VERSION=$(./dist/darwin_amd64/circleci version)
-          export TAG=v$(ruby -e "puts '$VERSION'.split('+')[0]")
-          export REVISION=$(git rev-parse $(ruby -e "puts '$VERSION'.split('+')[1]"))
-          echo "Bumping circleci to $TAG+$REVISION"
-          brew bump-formula-pr --strict \
-            --tag=$TAG \
-            --revision=$CIRCLE_SHA1 \
-            circleci
+      - run: ./.circleci/brew-deploy.sh
 
 workflows:
   version: 2