feat: only release from the release branch

Author: josegonzalez

.circleci/config.yml

@@ -13,7 +13,6 @@ jobs:
       - run: make build
       - run:
           command: |
-            if [[ -n "$CIRCLE_TAG" ]]; then
-              export VERSION="$CIRCLE_TAG"
-            fi
+          if [ "${CIRCLE_BRANCH}" == "release" ]; then
             make release
+          fi

.env

@@ -0,0 +1,4 @@
+# I am a comment and that is OK
+SOME_VAR=someval
+FOO=BAR # comments at line end are OK too
+export BAR=BAZ

Makefile

@@ -30,15 +30,7 @@ deps:
 docker-image:
 	docker build -q -f Dockerfile.build -t $(IMAGE_NAME):$(BUILD_TAG) .
 
-ifdef CIRCLE_TAG
-release: make-release
-else
-release:
-	@echo "No release necessary"
-endif
-
-
-make-release: build
+release: build
 	rm -rf release && mkdir release
 	tar -zcf release/$(NAME)_$(VERSION)_linux_$(HARDWARE).tgz -C build/linux $(NAME)
 	tar -zcf release/$(NAME)_$(VERSION)_darwin_$(HARDWARE).tgz -C build/darwin $(NAME)

Procfile

@@ -0,0 +1,5 @@
+<<<<<<< HEAD=0
+web: python -p $PORT server
+======
+worker: python work.py --derp $PS
+>>>>>>> 5bb7ec3e2a8f4f6565432a4fc82c92d4a3603d28=0