ci: try install of ponzu branch

ponzu-cms · Nov 27, 2019 · 8db1e91 · 8db1e91
1 parent ef9d7c4
commit 8db1e91
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,8 +8,8 @@ jobs:
       - checkout
 
       # generate and build project to test
-      - run: curl https://raw.githubusercontent.com/ponzu-cms/ponzu/ponzu-dev/.circleci/test-setup.sh | sh
+      - run: .circleci/test-setup.sh
 
       # run tests
-      - run: curl https://raw.githubusercontent.com/ponzu-cms/ponzu/ponzu-dev/.circleci/test-run.sh | sh
+      - run: .circleci/test-run.sh | sh
 
diff --git a/.circleci/test-setup.sh b/.circleci/test-setup.sh
@@ -5,25 +5,29 @@
 set -ex 
 
 # Install Ponzu CMS
-go install ./...
+go get github.com/ponzu-cms/ponzu/...
 
 # test install
 ponzu
 
+PROJ_PATH=github.com/ponzu-cms/ci/test-project
 # create a project and generate code
 if [ $CIRCLE_BRANCH = "ponzu-dev" ]; then
         # ensure we have the latest from ponzu-dev branch
         cd /go/src/github.com/ponzu-cms/ponzu
         git checkout ponzu-dev
         git pull origin ponzu-dev
 
+        # install ponzu-dev branch of CLI
+        go install ./...
+
         # create new project using the ponzu-dev branch
-        ponzu new --dev github.com/ponzu-cms/ci/test-project
+        ponzu new --dev ${PROJ_PATH}
 else 
-        ponzu new github.com/ponzu-cms/ci/test-project
+        ponzu new ${PROJ_PATH}
 fi
 
-cd /go/src/github.com/ponzu-cms/ci/test-project
+cd /go/src/${PROJ_PATH}
 
 ponzu gen content person name:string hashed_secret:string
 ponzu gen content message from:@person,hashed_secret to:@person,hashed_secret