From 92c89b98eec5c3cf7917211a1ae24f9b546b7358 Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sun, 23 Dec 2018 09:20:10 -0800 Subject: [PATCH 1/3] travis: Utilize build stages for deploy --- .travis.yml | 19 ++++++++++++------- etc/travis-deploy.sh | 11 +++++++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b36230..92dc439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,17 +9,22 @@ addons: env: global: - GO111MODULE=on - - DEPLOY_WITH_MAJOR="1.11" -before_script: +install: - go get golang.org/x/lint/golint - make deps go: - "1.11.x" + - "tip" -deploy: - provider: script - script: etc/travis-deploy.sh - on: - tags: true +jobs: + include: + - stage: deploy + script: etc/travis-deploy.sh + go: "1.11.x" + +stages: + - test + - name: deploy + if: tag IS present diff --git a/etc/travis-deploy.sh b/etc/travis-deploy.sh index e93c363..f605004 100755 --- a/etc/travis-deploy.sh +++ b/etc/travis-deploy.sh @@ -1,10 +1,13 @@ #!/bin/bash # travis-deploy.sh -# description: Trigger goreleaser deployment in correct build scenarios +# description: Trigger goreleaser deployment set -eo pipefail set -x -if [[ "$TRAVIS_GO_VERSION" == "$DEPLOY_WITH_MAJOR."* ]]; then - curl -sL https://git.io/goreleaser | bash -fi +# downloading deps probably added to go.mod and go.sum, goreleaser will fail. +git reset --hard +git clean -dfx + +# build release. +curl -sL https://git.io/goreleaser | bash From 4dd3ad33f9e8ab8b0973fc249e376c280cb3d67a Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sun, 23 Dec 2018 10:39:52 -0800 Subject: [PATCH 2/3] travis: Add Elm stage --- .travis.yml | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92dc439..0e9d723 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,38 @@ -language: go sudo: false -addons: - apt: - packages: - - rpm - env: global: - GO111MODULE=on -install: - - go get golang.org/x/lint/golint - - make deps - +language: go go: - "1.11.x" - - "tip" + - "master" + +install: + - "go get golang.org/x/lint/golint" + - "make deps" jobs: include: + - stage: elm + install: + - "cd ui" + - "npm install" + script: + - "elm-format --validate ." + - "npm run build" + language: elm + elm: "0.19.0" - stage: deploy - script: etc/travis-deploy.sh - go: "1.11.x" + script: "etc/travis-deploy.sh" + addons: + apt: + packages: + - rpm stages: - test + - elm - name: deploy if: tag IS present From 55e11929c75fd92f87f529ccc2caacdbb4082779 Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sun, 23 Dec 2018 12:31:26 -0800 Subject: [PATCH 3/3] travis: Eliminate travis-deploy.sh --- .travis.yml | 4 +++- etc/travis-deploy.sh | 13 ------------- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100755 etc/travis-deploy.sh diff --git a/.travis.yml b/.travis.yml index 0e9d723..a3fd2bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ env: global: - GO111MODULE=on +# deploy will use first go version listed below. language: go go: - "1.11.x" @@ -25,7 +26,8 @@ jobs: language: elm elm: "0.19.0" - stage: deploy - script: "etc/travis-deploy.sh" + install: "true" + script: "curl -sL https://git.io/goreleaser | bash" addons: apt: packages: diff --git a/etc/travis-deploy.sh b/etc/travis-deploy.sh deleted file mode 100755 index f605004..0000000 --- a/etc/travis-deploy.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# travis-deploy.sh -# description: Trigger goreleaser deployment - -set -eo pipefail -set -x - -# downloading deps probably added to go.mod and go.sum, goreleaser will fail. -git reset --hard -git clean -dfx - -# build release. -curl -sL https://git.io/goreleaser | bash