From faa868221ba39f6b1cc5b79c561d318c9715b013 Mon Sep 17 00:00:00 2001 From: manasdk Date: Fri, 25 Mar 2016 12:35:35 -0700 Subject: [PATCH 1/2] Fix branch checkout logic --- circle.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index 7c819bd01a..399f319392 100644 --- a/circle.yml +++ b/circle.yml @@ -39,11 +39,8 @@ machine: checkout: post: - - | - git clone --depth 1 ${ST2_PACKAGES_REPO} /home/ubuntu/st2/st2-packages - cd /home/ubuntu/st2/st2-packages - git checkout ${CIRCLE_BRANCH} || true - - .circle/buildenv.sh + - git clone -b ${CIRCLE_BRANCH} --single-branch --depth 1 ${ST2_PACKAGES_REPO} /home/ubuntu/st2/st2-packages + - /home/ubuntu/st2/st2-packages/.circle/buildenv.sh dependencies: cache_directories: From 3fab929d455228af2e15e7341146db606a938643 Mon Sep 17 00:00:00 2001 From: manasdk Date: Fri, 25 Mar 2016 19:50:08 -0700 Subject: [PATCH 2/2] CWD is always the build-dir --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 399f319392..b2a1d5847a 100644 --- a/circle.yml +++ b/circle.yml @@ -40,7 +40,7 @@ machine: checkout: post: - git clone -b ${CIRCLE_BRANCH} --single-branch --depth 1 ${ST2_PACKAGES_REPO} /home/ubuntu/st2/st2-packages - - /home/ubuntu/st2/st2-packages/.circle/buildenv.sh + - .circle/buildenv.sh dependencies: cache_directories: