From 071634f1d0c0bba8f16254240df161a0bd12b734 Mon Sep 17 00:00:00 2001 From: Eric Elsken Date: Fri, 14 Jun 2019 20:57:56 -0700 Subject: [PATCH 1/5] Update .travis.yml and bin/travis/install --- .travis.yml | 4 ++-- bin/bump_version.sh | 37 ------------------------------ bin/travis/{install.sh => install} | 1 + 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100755 bin/bump_version.sh rename bin/travis/{install.sh => install} (99%) diff --git a/.travis.yml b/.travis.yml index 6f14ad5..068e63a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.5.1 + - 1.x notifications: email: @@ -11,7 +11,7 @@ notifications: on_failure: change install: - - ./bin/travis/install.sh + - ./bin/travis/install script: - ./bin/travis/test_coverage.sh diff --git a/bin/bump_version.sh b/bin/bump_version.sh deleted file mode 100755 index 835696e..0000000 --- a/bin/bump_version.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -#ensure we are on the master branch. -branch=$(git branch | grep "*" | cut -d " " -f 2) -if [ "$branch" != "master" ]; then - >&2 echo "you must be on master branch to run this command" - exit 1 -fi - -#grab the version argument. -version="$1" - -if [ -z "$version" ]; then - >&2 echo "usage: first argument supplied must be a non-empty version" - exit 2 -fi - -#set tag on new version commit. -git tag -a "$version" -did_tag=$? - -if [ $did_tag -ne 0 ]; then - exit 3 -fi - -#push master branch and new tag to origin. -git push origin master tag "$version" -did_push=$? - -echo "\n" - -if [ $did_push -eq 0 ]; then - echo "Version bump, commit, tag, and push to origin/master successful!!" -else - >&2 echo "failed to push new tag to origin/master" - exit 4 -fi diff --git a/bin/travis/install.sh b/bin/travis/install similarity index 99% rename from bin/travis/install.sh rename to bin/travis/install index 6a2a7de..40defb0 100755 --- a/bin/travis/install.sh +++ b/bin/travis/install @@ -2,4 +2,5 @@ go get github.com/axw/gocov/gocov go get github.com/ericelsken/goveralls + go get -t ./... From 5abe040c098f8be1c9f57759951f4aa8eee44aad Mon Sep 17 00:00:00 2001 From: Eric Elsken Date: Fri, 14 Jun 2019 21:06:52 -0700 Subject: [PATCH 2/5] Add logging to bin/travis/install --- bin/travis/install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/travis/install b/bin/travis/install index 40defb0..52624fa 100755 --- a/bin/travis/install +++ b/bin/travis/install @@ -1,5 +1,8 @@ #!/bin/sh +echo $PWD +echo $GOPATH + go get github.com/axw/gocov/gocov go get github.com/ericelsken/goveralls From 5576670fbfb3dca68caa3ab8453ac99b2238e8bd Mon Sep 17 00:00:00 2001 From: Eric Elsken Date: Tue, 2 Jul 2019 16:48:03 -0700 Subject: [PATCH 3/5] Update bin scripts --- .travis.yml | 7 +++++-- bin/coveralls/{push.sh => push} | 0 bin/travis/install | 2 +- bin/travis/{test_coverage.sh => test-coverage} | 0 go.mod | 2 ++ 5 files changed, 8 insertions(+), 3 deletions(-) rename bin/coveralls/{push.sh => push} (100%) rename bin/travis/{test_coverage.sh => test-coverage} (100%) diff --git a/.travis.yml b/.travis.yml index 068e63a..14e8866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,14 @@ notifications: on_success: change on_failure: change +env: + - GO111MODULE=on + install: - ./bin/travis/install script: - - ./bin/travis/test_coverage.sh + - ./bin/travis/test-coverage after_success: - - ./bin/coveralls/push.sh + - ./bin/coveralls/push diff --git a/bin/coveralls/push.sh b/bin/coveralls/push similarity index 100% rename from bin/coveralls/push.sh rename to bin/coveralls/push diff --git a/bin/travis/install b/bin/travis/install index 52624fa..289f423 100755 --- a/bin/travis/install +++ b/bin/travis/install @@ -6,4 +6,4 @@ echo $GOPATH go get github.com/axw/gocov/gocov go get github.com/ericelsken/goveralls -go get -t ./... +go get ./... diff --git a/bin/travis/test_coverage.sh b/bin/travis/test-coverage similarity index 100% rename from bin/travis/test_coverage.sh rename to bin/travis/test-coverage diff --git a/go.mod b/go.mod index 66632fb..8d06deb 100644 --- a/go.mod +++ b/go.mod @@ -1 +1,3 @@ module github.com/gogolfing/config + +go 1.12 From 93f3a3c99d336019114b3fee5777adf2656896c3 Mon Sep 17 00:00:00 2001 From: Eric Elsken Date: Tue, 2 Jul 2019 17:37:19 -0700 Subject: [PATCH 4/5] Update .travis.yml with COVERALLS_TOKEN --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14e8866..206e883 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,10 @@ notifications: on_failure: change env: - - GO111MODULE=on + global: + - GO111MODULE=on + # COVERALLS_TOKEN + - secure: "i8j1qYXRo8PW/lVRsM4pFJbleA2xCygZhQ+TEzuG8JuM40Kj4eUQ5zeOalUN4fuBVpKBL+RLoi+aU+axhgVTyKWDjGaB8ckRuehFdMeOuRaw+bMQGzjWWyNF4lHfViT3vCLrcIK3dZyZMTestB1Nnhl6Rw6089GUkRSX7hS3Ys4zhyrjK5rz3z9I4C+vtft0BnZgLUtVG2THmCae8lt3iZykmfLqn9sg0OpIMGRwqTjRIrG00lt3MxNy3eAURMv5kKciGKRhlUDOgVOnMt/QfHpFHsdnsI+8T0eP481N6uvj4GDXH58FNiv7PM30La5NVyGq3D3cwHK8GXloZf+02Pb53oL4WQR1QoG736RNYAYeXOEM/L07s0cNIg+ZslTR8nTk1t6V4njwaeGhrexvmJOtIsTPLMEy1omxFcqUjrx1aWK2vwGPcVdxFKxoaM+8CQyBoHen2q51CH+j9m5f0euTs/Rdfq6hKdtEgnq+Q/Rw2xYW+9UyIGUqfuUawFHppeaWZ/6tvRDfss4XPOw+x3Y9NMhop0rNM5kaTDzF78azyTOeN1Nsy6slW4CLZ/bb0DWq6fkqVF/n9OkNBO17zi2GCnbyGHYk2n4OB2QB68tQekfc57AS/RDrT1pwD+J8jvbX7ysXJ3UvNljNhUvRRytOCJzOqJ7+PkHYPHBL94U=" install: - ./bin/travis/install From 960d07d8dad7d107e6a675ea2d3219ac79b6d5bd Mon Sep 17 00:00:00 2001 From: Eric Elsken Date: Tue, 2 Jul 2019 17:43:01 -0700 Subject: [PATCH 5/5] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 206e883..9102df8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ notifications: env: global: - GO111MODULE=on - # COVERALLS_TOKEN + #COVERALLS_TOKEN - secure: "i8j1qYXRo8PW/lVRsM4pFJbleA2xCygZhQ+TEzuG8JuM40Kj4eUQ5zeOalUN4fuBVpKBL+RLoi+aU+axhgVTyKWDjGaB8ckRuehFdMeOuRaw+bMQGzjWWyNF4lHfViT3vCLrcIK3dZyZMTestB1Nnhl6Rw6089GUkRSX7hS3Ys4zhyrjK5rz3z9I4C+vtft0BnZgLUtVG2THmCae8lt3iZykmfLqn9sg0OpIMGRwqTjRIrG00lt3MxNy3eAURMv5kKciGKRhlUDOgVOnMt/QfHpFHsdnsI+8T0eP481N6uvj4GDXH58FNiv7PM30La5NVyGq3D3cwHK8GXloZf+02Pb53oL4WQR1QoG736RNYAYeXOEM/L07s0cNIg+ZslTR8nTk1t6V4njwaeGhrexvmJOtIsTPLMEy1omxFcqUjrx1aWK2vwGPcVdxFKxoaM+8CQyBoHen2q51CH+j9m5f0euTs/Rdfq6hKdtEgnq+Q/Rw2xYW+9UyIGUqfuUawFHppeaWZ/6tvRDfss4XPOw+x3Y9NMhop0rNM5kaTDzF78azyTOeN1Nsy6slW4CLZ/bb0DWq6fkqVF/n9OkNBO17zi2GCnbyGHYk2n4OB2QB68tQekfc57AS/RDrT1pwD+J8jvbX7ysXJ3UvNljNhUvRRytOCJzOqJ7+PkHYPHBL94U=" install: