circleci: update to use workflows

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

.circleci/config.yml

@@ -1,63 +1,121 @@
 version: 2.1
 jobs:
-  build:
+  prepare:
     working_directory: ~/gui_build
     docker:
       - image: ansuel/gui-autobuild-image:2
     steps:
       - checkout
+      - run:
+          name: Check file ending
+          command: bash ./scripts/1-check_file_ending.sh
+      - run:
+          name: Minify css and javascript
+          command: bash ./scripts/1-compress_css_javascript.sh
+      - run:
+          name: Update po
+          command: python3 ./scripts/update_po.py
+      - persist_to_workspace:
+          root: ~/gui_build
+          paths: 
+            - decompressed
+            - data
+            - scripts
+            - inizialize_gui.sh
+  detect_build:
+    working_directory: ~/gui_build
+    docker:
+      - image: ansuel/gui-autobuild-image:2
+    steps:
+      - attach_workspace:
+          at: ~/gui_build
       - run:
           name: Check built type from last git log
           command: bash ./scripts/0-detect-build-type.sh
-      #- restore_cache:
-      #    keys: latest-file-key
+      - persist_to_workspace:
+          root: ~/gui_build
+          paths: 
+            - data
+  increment_version:
+    working_directory: ~/gui_build
+    docker:
+      - image: ansuel/gui-autobuild-image:2
+    steps:
+      - attach_workspace:
+          at: ~/gui_build
       - run:
           name: Increment version from latest build
           command: bash ./scripts/1-increment_autobuild_ver.sh
+      - persist_to_workspace:
+          root: ~/gui_build
+          paths: 
+            - decompressed
+            - data
+  init_and_update:
+    working_directory: ~/gui_build
+    docker:
+      - image: ansuel/gui-autobuild-image:2
+    steps:
+      - attach_workspace:
+          at: ~/gui_build
       - run:
-          name: Minify css and javascript
-          command: bash ./scripts/1-compress_css_javascript.sh
+          name: Set new version in rootdevice
+          command: bash ./scripts/2-set_new_version.sh
       - run:
           name: Clone autobuild repo
           command: bash ./scripts/2-clone_autobuild_dir.sh
-      - run:
-          name: Update po
-          command: python3 ./scripts/update_po.py
       - run:
           name: Inizialize Gui
           command: bash ./inizialize_gui.sh
       - run:
           name: Upload new build, build and latest.version
           command: bash ./scripts/3-update_autobuild_ver.sh
-      - run:
-          name: Committing updated po to master
-          command: bash ./scripts/6-commit_po.sh
-      #- save_cache:
-      #    key: latest-file-key
-      #    paths:
-      #      - ~/gui-dev-build-auto/latest.version
       - persist_to_workspace:
           root: ~/gui_build
           paths: 
             - compressed
             - scripts
             - data
-
-  publish-github-release:
+  commit_po_changes:
+    working_directory: ~/gui_build
+    docker:
+      - image: cibuilds/github:0.10
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/gui_build
+      - run:
+          name: Committing updated po to master
+          command: bash ./scripts/6-commit_po.sh
+  publish_github_release:
+    working_directory: ~/gui_build
     docker:
       - image: cibuilds/github:0.10
     steps:
       - attach_workspace:
-          at: /tmp/gui_build
+          at: ~/gui_build
       - run:
           name: "Publish Release on GitHub"
-          command: bash /tmp/gui_build/scripts/7-push-release.sh
+          command: bash ./scripts/7-push-release.sh
 
 workflows:
   version: 2
   build_and_deploy:
     jobs: 
-      - build
-      - publish-github-release:
+      - prepare
+      - detect_build:
+          requires:
+            - prepare
+      - increment_version:
+          requires:
+            - prepare
+      - commit_po_changes:
+          requires:
+            - prepare
+      - init_and_update:
+          requires:
+            - detect_build
+            - increment_version
+      - publish_github_release:
           requires:
-            - build
+            - init_and_update

inizialize_gui.sh

@@ -1,29 +1,3 @@
-echo "Fixing file..."
-
-nfile=0
-
-check_file_ending() {
-	for file in $1/*; do
-		if [ -d $file ]; then
-			check_file_ending $file
-		else
-			if [ -f $file ]; then
-				nfile=$[$nfile +1]
-				echo -ne 'File scanned: '$nfile'\r'
-				if [ $( dos2unix -ic $file ) ]; then
-					dos2unix $file
-					echo "Detected bad line-ending here: $file"
-				fi
-			fi
-		fi
-	done
-
-}
-
-check_file_ending decompressed
-echo ""
-echo "File fixed!"
-
 declare -a modular_dir=(
 	"base"
 	"gui_file"
@@ -49,7 +23,8 @@ if [ "$1" == "dev" ]; then
 fi
 
 if [ $CI == "true" ]; then
-	if [ -f ~/.dev ]; then
+	TYPE="$(cat $HOME/gui_build/data/type)"
+	if [ $TYPE == "DEV" ]; then
 		type="_dev"
 	fi
 fi

scripts/0-detect-build-type.sh

@@ -1,9 +1,13 @@
 last_log="$(git log --oneline -n 1)"
 
+if [ ! -f  $HOME/gui_build/data ]; then
+	mkdir $HOME/gui_build/data
+fi
+
 if [ "$( echo "$last_log" | grep "\[STABLE\]" )" ]; then
 	echo "Detected STABLE build."
-	touch ~/.stable
+	echo STABLE > $HOME/gui_build/data/type
 else
 	echo "Detected DEV build."
-	touch ~/.dev
+	echo DEV > $HOME/gui_build/data/type
 fi

scripts/1-check_file_ending.sh

@@ -0,0 +1,25 @@
+echo "Fixing file..."
+
+nfile=0
+
+check_file_ending() {
+	for file in $1/*; do
+		if [ -d $file ]; then
+			check_file_ending $file
+		else
+			if [ -f $file ]; then
+				nfile=$[$nfile +1]
+				echo -ne 'File scanned: '$nfile'\r'
+				if [ $( dos2unix -ic $file ) ]; then
+					dos2unix $file
+					echo "Detected bad line-ending here: $file"
+				fi
+			fi
+		fi
+	done
+
+}
+
+check_file_ending decompressed
+echo ""
+echo "File fixed!"

scripts/1-increment_autobuild_ver.sh

@@ -1,13 +1,11 @@
 last_log="$(git log --oneline -n 1)"
-rootdevice_file="decompressed/base/etc/init.d/rootdevice"
 
 if [ "$(echo "$last_log" | grep -o "\[[0-9]\+\.[0-9]\+\.[0-9]\+\]" | tr -d [ | tr -d ])" ]; then
-	manual_ver="$(echo "$last_log" | grep -o "\[[0-9]\+\.[0-9]\+\.[0-9]\+\]" | tr -d [ | tr -d ])"
-	echo "Detected manual version: "$manual_ver
-	sed -i s#version_gui=TO_AUTO_COMPLETE#version_gui=$manual_ver# $rootdevice_file
+	ver="$(echo "$last_log" | grep -o "\[[0-9]\+\.[0-9]\+\.[0-9]\+\]" | tr -d [ | tr -d ])"
+	echo "Detected manual version: "$ver
 else
 	latest_version_link="https://raw.githubusercontent.com/Ansuel/gui-dev-build-auto/master/latest.version"
-	version=$(curl -s $latest_version_link)
+	cur_ver=$(curl -s $latest_version_link)
 
 	if [ -f $HOME/gui-dev-build-auto/latest.version ]; then
 		echo "Detected cached latest.version file... Checking it..."
@@ -33,9 +31,9 @@ else
 
 	echo "Increment version as this is an autobuild"
 
-	major=$(echo $version | grep -Eo "^[0-9]+")
-	dev_num=$(echo $version | sed -E s/[0-9]+\.[0-9]+\.//)
-	minor=$(echo $version | sed  s#$major\.## | sed s#\\.$dev_num## )
+	major=$(echo $cur_ver | grep -Eo "^[0-9]+")
+	dev_num=$(echo $cur_ver | sed -E s/[0-9]+\.[0-9]+\.//)
+	minor=$(echo $cur_ver | sed  s#$major\.## | sed s#\\.$dev_num## )
 	
 	if [ $((dev_num + 1)) -gt 99 ]; then
 		echo "dev_num greater than 99 increment minor"
@@ -51,10 +49,14 @@ else
 		dev_num=$((dev_num + 1))
 	fi
 	
-	new_version=$major.$minor.$dev_num
+	ver=$major.$minor.$dev_num
 	
-	echo "Detected version: "$version
-	echo "New version to apply: "$new_version
-	
-	sed -i s#version_gui=TO_AUTO_COMPLETE#version_gui=$new_version# $rootdevice_file
+	echo "Detected version: "$cur_ver
+	echo "New version to apply: "$ver
+fi
+
+if [ ! -f  $HOME/gui_build/data ]; then
+	mkdir $HOME/gui_build/data
 fi
+
+echo $ver > $HOME/gui_build/data/version

scripts/2-set_new_version.sh

@@ -0,0 +1,4 @@
+version="$(cat $HOME/gui_build/data/version)"
+rootdevice_file="$HOME/gui_build/decompressed/base/etc/init.d/rootdevice"
+sed -i s#version_gui=TO_AUTO_COMPLETE#version_gui=$ver# $rootdevice_file
+

scripts/3-update_autobuild_ver.sh

@@ -1,12 +1,13 @@
 if [ $CI == "true" ]; then
-	if [ -f ~/.dev ]; then
+	TYPE="$(cat ~/gui_build/data/type)"
+	if [ $TYPE == "DEV" ]; then
 		type="_dev"
-	elif [ -f ~/.stable ]; then
+	elif [ $TYPE == "STABLE" ]; then
 		stable_msg="STABLE"
 	fi
 fi
 md5sum=$(md5sum compressed/GUI$type.tar.bz2 | awk '{print $1}')
-version=$(cat total/etc/init.d/rootdevice | grep -m1 version_gui | cut -d'=' -f 2)
+version="$(cat ~/gui_build/data/version)"
 if ! grep -w -q "$version" $HOME/gui-dev-build-auto/version ; then
 	echo "Adding md5sum of new GUI to version file"
 	echo "Version: "$version" Md5sum: "$md5sum
@@ -26,22 +27,19 @@ cp compressed/GUI$type.tar.bz2 $HOME/gui-dev-build-auto/ -r;
 cd $HOME/gui-dev-build-auto/;
 
 if [ $CI == "true" ]; then
-	if [ -f ~/.stable ]; then
-		build_type_name="STABLE"
-		echo $version > stable.version
-	elif [ -f ~/.dev ]; then
+	if [ ~/gui_build/data/type ]; then
+		build_type_name=$(cat ~/gui_build/data/type)
+		if [ $build_type_name == "STABLE" ]; then
+			echo $version > stable.version
+		fi
+	else
 		build_type_name="DEV"
 	fi
 	commit_link=https://github.com/Ansuel/tch-nginx-gui/commit/$CIRCLE_SHA1
 fi
 
 echo $version > latest.version
 
-mkdir ~/gui_build/data
-
-echo $version > ~/gui_build/data/version
-echo $build_type_name > ~/gui_build/data/type
-
 git add -A;
 git commit -a -m "[$build_type_name] Version: $version Commit: $commit_link";
 git push origin master;

scripts/6-commit_po.sh

@@ -1,3 +1,7 @@
+git config --global user.name "CircleCI";
+git config --global user.email "CircleCI";
+
+ssh -o StrictHostKeyChecking=no git@github.com
 
 cd $HOME/gui_build
 

scripts/7-push-release.sh

@@ -1,7 +1,7 @@
 
-DIR="/tmp/gui_build/compressed"
-VERSION="$(cat /tmp/gui_build/data/version)"
-TYPE="$(cat /tmp/gui_build/data/type)"
+DIR="$HOME/gui_build/compressed"
+VERSION="$(cat $HOME/gui_build/data/version)"
+TYPE="$(cat $HOME/gui_build/data/type)"
 if [ $TYPE == "DEV" ]; then
 	PRERELEASE="-prerelease"
 fi