From eaea34503b7c3fa3f78b1f06fe9a3d11557fb8a3 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 21 Sep 2019 21:39:17 +0200
Subject: [PATCH] Use branch for repo in circleci deploy

---
 .circleci/config.yml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dfb58ee50..fa4fa14c1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,8 +68,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -127,8 +127,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -186,8 +186,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -245,8 +245,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -304,8 +304,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -366,8 +366,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -426,8 +426,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -485,8 +485,8 @@ jobs:
       - run:
           name: Deploy wrt3200acm
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
-            rsync -av --delete-after ~/openmptcprouter/wrt3200acm/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/${OMR_KERNEL:-4.14}/wrt3200acm
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/wrt3200acm/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/wrt3200acm
             rm -rf ~/openmptcprouter/wrt3200acm/source/bin
 
       - save_cache:
@@ -518,8 +518,8 @@ jobs:
       - run:
           name: Deploy wrt32x
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
-            rsync -av --delete-after ~/openmptcprouter/wrt32x/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/${OMR_KERNEL:-4.14}/wrt32x
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/wrt32x/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH}/${OMR_KERNEL:-4.14}/wrt32x
 
 workflows:
   version: 2