From 97e9d68c3b2cc456be522bf11e826e169b5220f6 Mon Sep 17 00:00:00 2001
From: Abhilash Raj <maxking@users.noreply.github.com>
Date: Sun, 5 Nov 2017 21:22:19 -0800
Subject: [PATCH] Ci workflows (#185)

* Build dev images with every commit.

* Use virtualenv to build dev images.

* Activate virtualenv properly.
---
 .circleci/config.yml |  3 --
 build.sh             | 68 +++++++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d8a233d..74becef 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,6 +58,3 @@ workflows:
     jobs:
       - build:
           context: org-global
-          filters:
-            branches:
-              only: master
diff --git a/build.sh b/build.sh
index 707c644..c3787ac 100755
--- a/build.sh
+++ b/build.sh
@@ -6,45 +6,47 @@ DOCKER=docker
 
 # Set the env variable to later test this release before it is deployed.
 if [ "$1" = "dev" ]; then
-		export DEV=true
+	export DEV=true
 fi
 
 REG_URL=${REGISTRY}_URL
 
 if [ "$EVENT_TYPE" = "cron" ]  || [ "$DEV" = "true" ] ; then
-		python -m pip install python-gitlab
-		# Get the latest commit for repositories and set their reference values to be
-		# used in the development builds.
-		CORE_REF=$(python get_latest_ref.py mailman/mailman)
-		CLIENT_REF=$(python get_latest_ref.py mailman/mailmanclient)
-		POSTORIUS_REF=$(python get_latest_ref.py mailman/postorius)
-		HYPERKITTY_REF=$(python get_latest_ref.py mailman/hyperkitty)
-		DJ_MM3_REF=$(python get_latest_ref.py mailman/django-mailman3)
-		MM3_HK_REF=$(python get_latest_ref.py mailman/mailman-hyperkitty)
+	python3 -m venv venv
+	source venv/bin/activate
+	pip install python-gitlab
+	# Get the latest commit for repositories and set their reference values to be
+	# used in the development builds.
+	CORE_REF=$(python get_latest_ref.py mailman/mailman)
+	CLIENT_REF=$(python get_latest_ref.py mailman/mailmanclient)
+	POSTORIUS_REF=$(python get_latest_ref.py mailman/postorius)
+	HYPERKITTY_REF=$(python get_latest_ref.py mailman/hyperkitty)
+	DJ_MM3_REF=$(python get_latest_ref.py mailman/django-mailman3)
+	MM3_HK_REF=$(python get_latest_ref.py mailman/mailman-hyperkitty)
 
-		# Build the mailman-core image.
-		$DOCKER build -f core/Dockerfile.dev \
-						--build-arg CORE_REF=$CORE_REF \
-						--build-arg MM3_HK_REF=$MM3_HK_REF \
-						--label version.core="$CORE_REF" \
-						--label version.mm3-hk="$MM3_HK_REF" \
-						--label version.git_commit="$COMMIT_ID" \
-						-t ${!REG_URL}/maxking/mailman-core:rolling core/
+	# Build the mailman-core image.
+	$DOCKER build -f core/Dockerfile.dev \
+			--build-arg CORE_REF=$CORE_REF \
+			--build-arg MM3_HK_REF=$MM3_HK_REF \
+			--label version.core="$CORE_REF" \
+			--label version.mm3-hk="$MM3_HK_REF" \
+			--label version.git_commit="$COMMIT_ID" \
+			-t ${!REG_URL}/maxking/mailman-core:rolling core/
 
-		# Build the mailman-web image.
-		$DOCKER build -f web/Dockerfile.dev \
-				        --label version.git_commit="$COMMIT_ID" \
-						--label version.postorius="$POSTORIUS_REF" \
-						--label version.hyperkitty="$HYPERKITTY_REF" \
-						--label version.client="$CLIENT_REF" \
-						--label version.dj-mm3="$DJ_MM3_REF" \
-						--build-arg POSTORIUS_REF=$POSTORIUS_REF \
-						--build-arg CLIENT_REF=$CLIENT_REF \
-						--build-arg HYPERKITTY_REF=$HYPERKITTY_REF \
-						--build-arg DJ_MM3_REF=$DJ_MM3_REF \
-						-t ${!REG_URL}/maxking/mailman-web:rolling web/
+	# Build the mailman-web image.
+	$DOCKER build -f web/Dockerfile.dev \
+			--label version.git_commit="$COMMIT_ID" \
+			--label version.postorius="$POSTORIUS_REF" \
+			--label version.hyperkitty="$HYPERKITTY_REF" \
+			--label version.client="$CLIENT_REF" \
+			--label version.dj-mm3="$DJ_MM3_REF" \
+			--build-arg POSTORIUS_REF=$POSTORIUS_REF \
+			--build-arg CLIENT_REF=$CLIENT_REF \
+			--build-arg HYPERKITTY_REF=$HYPERKITTY_REF \
+			--build-arg DJ_MM3_REF=$DJ_MM3_REF \
+			-t ${!REG_URL}/maxking/mailman-web:rolling web/
 else
-		# Do the normal building process.
-		$DOCKER build -t ${!REG_URL}/maxking/mailman-core:$TAG core/
-		$DOCKER build -t ${!REG_URL}/maxking/mailman-web:$TAG web/
+	# Do the normal building process.
+	$DOCKER build -t ${!REG_URL}/maxking/mailman-core:$TAG core/
+	$DOCKER build -t ${!REG_URL}/maxking/mailman-web:$TAG web/
 fi