diff options
| author | Steve Manuel <nilslice@gmail.com> | 2018-05-09 12:16:36 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-09 12:16:36 -0600 |
| commit | 1c1a87c57b6407a41b30e0eb9416f03f4b118aac (patch) | |
| tree | d0ce6a43ae1227c51d856dad381106c0f84b7bcf /.circleci/test-setup.sh | |
| parent | dab54818334b4bccecbe3c322b0d21bf364d165a (diff) | |
merge contributions (#246)
* expanded help to mention need to import addon (#243)
* Remove unused extra backtick (#239)
* remove import for golang.org/net/x/http2, co-locate error message
* update CI code to run --dev if on ponzu-dev branch
* CI: ensure we have latest from ponzu-dev branch
Diffstat (limited to '.circleci/test-setup.sh')
| -rwxr-xr-x | .circleci/test-setup.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/.circleci/test-setup.sh b/.circleci/test-setup.sh index 76085e3..33139a4 100755 --- a/.circleci/test-setup.sh +++ b/.circleci/test-setup.sh @@ -7,20 +7,27 @@ set -ex # Install Ponzu CMS go get -u github.com/ponzu-cms/ponzu/... - # test install ponzu - # create a project and generate code -ponzu new github.com/ponzu-cms/ci/test-project +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 + + # create new project using the ponzu-dev branch + ponzu new --dev github.com/ponzu-cms/ci/test-project +else + ponzu new github.com/ponzu-cms/ci/test-project +fi cd /go/src/github.com/ponzu-cms/ci/test-project ponzu gen content person name:string hashed_secret:string ponzu gen content message from:@person,hashed_secret to:@person,hashed_secret - # build and run dev http/2 server with TLS ponzu build |