From 2a2557f24e05c655eb7e9d57a0d47ec0db2502e7 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 15:17:43 +0200 Subject: [PATCH 01/12] sound: extend CI checks --- .travis.yml | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7db2575..565732d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,32 @@ language: go go: - "1.10" + - "1.11" - "tip" notifications: on_success: false on_failure: always -install: go get -t zikichombo.org/sound/... - -script: go test zikichombo.org/sound/... - - - - +env: + global: + - GOPATH=$HOME/gopath + - PATH=$GOPATH/bin:$PATH + +install: + - cd ${$GOPATH}/src/zikichombo.org/sound + - go get -t ./... + +before_script: + - go get -u golang.org/x/tools/cmd/cover + - go get -u golang.org/x/tools/cmd/goimports + - go get -u github.com/golang/lint/golint + - go get -u github.com/mattn/goveralls + - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint + - wget https://raw.githubusercontent.com/mewmew/ci/master/ci_checks.sh + - chmod +x ci_checks.sh + +script: + - cd ${$GOPATH}/src/zikichombo.org/sound + - go test ./... + - ./ci_checks.sh From b209c63856e46f28b5f626f7f114ba18b977761b Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 15:23:25 +0200 Subject: [PATCH 02/12] sound: add TODO Mostly to tickle a new build on Travis-CI. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 565732d..9f15035 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ before_script: - go get -u github.com/golang/lint/golint - go get -u github.com/mattn/goveralls - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint + # TODO: Move mewmew/ci to zc/meta? - wget https://raw.githubusercontent.com/mewmew/ci/master/ci_checks.sh - chmod +x ci_checks.sh From e6329a62465ac1e7e77bdc3bfe1bf52901a6b080 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 15:27:52 +0200 Subject: [PATCH 03/12] ci: fix bad substitution of GOPATH --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f15035..66bd374 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: - PATH=$GOPATH/bin:$PATH install: - - cd ${$GOPATH}/src/zikichombo.org/sound + - cd ${GOPATH}/src/zikichombo.org/sound - go get -t ./... before_script: @@ -29,6 +29,6 @@ before_script: - chmod +x ci_checks.sh script: - - cd ${$GOPATH}/src/zikichombo.org/sound + - cd ${GOPATH}/src/zikichombo.org/sound - go test ./... - ./ci_checks.sh From 8e94858f15af3f9fd21c2bc92160869db93d2a53 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 15:30:15 +0200 Subject: [PATCH 04/12] ci: fix go get --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 66bd374..8970ebf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,7 @@ env: - PATH=$GOPATH/bin:$PATH install: - - cd ${GOPATH}/src/zikichombo.org/sound - - go get -t ./... + - go get -t zikichombo.org/sound/... before_script: - go get -u golang.org/x/tools/cmd/cover From 13d534ec8c3deaf4f33268819ced77172c044525 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 15:33:54 +0200 Subject: [PATCH 05/12] ci: download ci_checks script into correct directory --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8970ebf..a4fdef0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ before_script: - go get -u github.com/mattn/goveralls - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint # TODO: Move mewmew/ci to zc/meta? + - cd ${GOPATH}/src/zikichombo.org/sound - wget https://raw.githubusercontent.com/mewmew/ci/master/ci_checks.sh - chmod +x ci_checks.sh From 49897dce116780dd022f77547590cbb00bf49081 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 15:41:43 +0200 Subject: [PATCH 06/12] ci: handle branches --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a4fdef0..f999f3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,18 @@ notifications: env: global: - - GOPATH=$HOME/gopath - PATH=$GOPATH/bin:$PATH +before_install: + # Move git repo cloned by Travis-CI as then we get the correct branch + # automatically. + - mkdir -p ${GOPATH}src/zikichombo.org + - cd .. + - mv sound ${GOPATH}src/zikichombo.org/ + - cd ${GOPATH}src/zikichombo.org/sound + install: - - go get -t zikichombo.org/sound/... + - go get -t ./... before_script: - go get -u golang.org/x/tools/cmd/cover @@ -24,11 +31,9 @@ before_script: - go get -u github.com/mattn/goveralls - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint # TODO: Move mewmew/ci to zc/meta? - - cd ${GOPATH}/src/zikichombo.org/sound - wget https://raw.githubusercontent.com/mewmew/ci/master/ci_checks.sh - chmod +x ci_checks.sh script: - - cd ${GOPATH}/src/zikichombo.org/sound - go test ./... - ./ci_checks.sh From 190648eab9e9c18a0b44f772a66cc562b732428d Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 15:46:57 +0200 Subject: [PATCH 07/12] ci: fix GOPATH and move go test to ci_checks script --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f999f3e..66d1e8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,10 @@ env: before_install: # Move git repo cloned by Travis-CI as then we get the correct branch # automatically. - - mkdir -p ${GOPATH}src/zikichombo.org + - mkdir -p ${GOPATH}/src/zikichombo.org - cd .. - - mv sound ${GOPATH}src/zikichombo.org/ - - cd ${GOPATH}src/zikichombo.org/sound + - mv sound ${GOPATH}/src/zikichombo.org/ + - cd ${GOPATH}/src/zikichombo.org/sound install: - go get -t ./... @@ -35,5 +35,4 @@ before_script: - chmod +x ci_checks.sh script: - - go test ./... - ./ci_checks.sh From dc47d799e99c2d51f318145ecd73baefd60331df Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 15:52:55 +0200 Subject: [PATCH 08/12] ci: update TRAVIS_BUILD_DIR --- .travis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 66d1e8a..7bbf8a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,16 +9,12 @@ notifications: on_success: false on_failure: always -env: - global: - - PATH=$GOPATH/bin:$PATH - before_install: # Move git repo cloned by Travis-CI as then we get the correct branch # automatically. - - mkdir -p ${GOPATH}/src/zikichombo.org - - cd .. - - mv sound ${GOPATH}/src/zikichombo.org/ + - mkdir -p ${GOPATH}/src/zikichombo.org/sound + - rsync -az ${TRAVIS_BUILD_DIR}/ ${GOPATH}/src/zikichombo.org/sound + - export TRAVIS_BUILD_DIR=${GOPATH}/src/zikichombo.org/sound - cd ${GOPATH}/src/zikichombo.org/sound install: From 0bf4e6d787d7e485dfe59c6adb280091572d0278 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 16:59:39 +0200 Subject: [PATCH 09/12] ci: add coveralls.io token --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7bbf8a6..010eeda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,11 @@ go: - "1.11" - "tip" +env: + global: + # Coveralls.io token. + secure: G6HmpweRbjhfFL/CPfQCaZq+DFOJ7bT43lyLhuLVPS3BvEMCpTGcCM/gMfE12VJOq5o76QtgPKmmf96GtvOqmRqeG/IyKJTMnsnliNshSII26HnFLHWrVOWkrFucsmGcQ7gHPZ11JTIImCV4THcIgM1+0W12tQAjohQYGnNexVKvgvJ/E0EDrO7+hj92TnY+ffF/zptKUFRZ9ehnXTxlJdGaCazg+akHHM2tKVutfwSmx4HYYKHLjBs+X/SYEpuCGNsWTMBr60DwNURJI6ryve+fge9tVNY6MFOZWPxvc0sM0eQ5eaWoFOX7qvGRgiR6yZZN5WICjKplJ5W0vzcGBJzXwqM5n9KL2f3ZMD4Pdnzk1amfrzijvOcqPEoky0gvyWt3JnVI4XJkqKC1O7VOanuIbay93a1Jqhb+iPqWOAdy1QVaV9zHh2nfqHJpVIU/MK2pRHqCEARGoBVG+CLAQlYU5Y1zOxIXNAsqGCF52Tum16opOlGmE1p699QcMx6IUR1LydaE0kF77Nwfoneoa6ByDlR28aXpDQWyFdxQzKf78ND4a8YpczVrv4eo6PRHev0O53L4e2CdhIv5X+FujTBpsxa221Jz12jbjVkkSlRRxi5dXR+hpCR8M1W617nZ2bJJf0jkUcSWiQq165DXAjeg52LsR32dTtJZ4mTnSGQ= + notifications: on_success: false on_failure: always From 508512378ef116865b55dfbd9590d0dd38dfc167 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 17:02:43 +0200 Subject: [PATCH 10/12] ci: use ci_checks script from zc/meta --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 010eeda..2f2081f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,7 @@ before_script: - go get -u github.com/golang/lint/golint - go get -u github.com/mattn/goveralls - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint - # TODO: Move mewmew/ci to zc/meta? - - wget https://raw.githubusercontent.com/mewmew/ci/master/ci_checks.sh + - wget https://raw.githubusercontent.com/zikichombo/meta/master/ci_checks.sh - chmod +x ci_checks.sh script: From 144223004425f5a47eba7bb2676234397ffa95a1 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 17:06:52 +0200 Subject: [PATCH 11/12] Revert "ci: use ci_checks script from zc/meta" This reverts commit 508512378ef116865b55dfbd9590d0dd38dfc167. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f2081f..010eeda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,8 @@ before_script: - go get -u github.com/golang/lint/golint - go get -u github.com/mattn/goveralls - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint - - wget https://raw.githubusercontent.com/zikichombo/meta/master/ci_checks.sh + # TODO: Move mewmew/ci to zc/meta? + - wget https://raw.githubusercontent.com/mewmew/ci/master/ci_checks.sh - chmod +x ci_checks.sh script: From b56ad0387f81e8a16efdf27105561774e6852178 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Fri, 7 Sep 2018 17:19:20 +0200 Subject: [PATCH 12/12] Revert "Revert "ci: use ci_checks script from zc/meta"" This reverts commit 144223004425f5a47eba7bb2676234397ffa95a1. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 010eeda..2f2081f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,7 @@ before_script: - go get -u github.com/golang/lint/golint - go get -u github.com/mattn/goveralls - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint - # TODO: Move mewmew/ci to zc/meta? - - wget https://raw.githubusercontent.com/mewmew/ci/master/ci_checks.sh + - wget https://raw.githubusercontent.com/zikichombo/meta/master/ci_checks.sh - chmod +x ci_checks.sh script: