Skip to content

Commit

Permalink
move to go-mod + update deps + canonical imports + travis update + ve…
Browse files Browse the repository at this point in the history
…rbose when reading package fails
  • Loading branch information
jdel committed Dec 3, 2019
1 parent 1f9ebb1 commit a085716
Show file tree
Hide file tree
Showing 31 changed files with 379 additions and 435 deletions.
25 changes: 0 additions & 25 deletions .bintray.json

This file was deleted.

3 changes: 0 additions & 3 deletions .tidelift.yml

This file was deleted.

60 changes: 38 additions & 22 deletions .travis.yml
@@ -1,26 +1,48 @@
language: go
go:
- 1.9
- 1.13
addons:
apt:
packages:
- python3
- python3-pip
- python3-setuptools
- python3-wheel
cache:
directories:
- "$HOME/.cache/pip"
before_install:
- curl -sSL https://codeclimate.com/downloads/test-reporter/test-reporter-0.6.3-linux-amd64
-o ${GOPATH}/bin/test-reporter
- chmod +x ${GOPATH}/bin/test-reporter
- go get -v github.com/mitchellh/gox@v1.0.1
install:
- go get -v github.com/golang/dep/cmd/dep
- go get -v github.com/codeclimate/test-reporter
- go get -v github.com/mitchellh/gox
- cd $GOPATH/src/github.com/golang/dep/cmd/dep && git checkout tags/v0.4.1 && go install
- cd $GOPATH/src/github.com/codeclimate/test-reporter && git checkout tags/v0.4.3 && go install
- cd $GOPATH/src/github.com/jdel/gosspks
- dep ensure -v -vendor-only
- go get -v ./...
before_script:
- test-reporter before-build
script:
- go test -v -coverprofile c.out -coverpkg ./...
- gox -osarch="linux/386 linux/amd64 linux/arm darwin/amd64 darwin/386 windows/amd64 windows/386" -output="out/{{.Dir}}-{{.OS}}-{{.Arch}}" -ldflags "-X github.com/jdel/gosspks/cfg.Version=$TRAVIS_TAG"
- go test -coverprofile c.out ./... -race
- gox -osarch="linux/386 linux/amd64 linux/arm linux/arm64 darwin/amd64 darwin/386
windows/amd64 windows/386" -output="out/{{.Dir}}-{{.OS}}-{{.Arch}}" -ldflags "-s
-w -X jdel.org/gosspks/cfg.Version=${TRAVIS_BRANCH}"
after_script:
- test-reporter after-build --coverage-input-type gocov --exit-code $TRAVIS_TEST_RESULT
- test-reporter after-build --coverage-input-type gocov --prefix jdel.org/gosspks --exit-code ${TRAVIS_TEST_RESULT}
deploy:
- provider: script
skip_cleanup: true
script: bash scripts/vangen.sh
on:
branch: master
- provider: script
skip_cleanup: true
script: bash scripts/b2.sh
on:
tags: false
all_branches: true
- provider: releases
overwrite: true
api_key:
secure: DsqlZFCRRHp3Xits4DoedqfDl8oR6oVYxlTb/bA3rSW2GqkokPSO39PCSLOhyxnvugtkCKGS/SvL5tz09QSm2JKfNKIMheCWZwldz9ZYc6XYQxPkM6lRm8XOyy4eWy7lUx9P988dIaaa8k8ebNUHe0VQhlu44jrUYXLqRnDK2Af95t0x1orctjyzM5T/kbWi/9qTj+MEd+ROzGMRIvna7ZdFfPqvPS7jgYHGx427SsqAnOEvvNONb/KR3EEPwnv/viXRi+7GygGgI79RQGd4v0c1/BxGeWF7MrldZpMoLjOFYgN84nK4gZeLZ7yyF15DAVtLOm+njE5ZL7gbu/6SFDi7TCQ1ph4OSBR+iXMUyBT0b8YsW80NAGV2mYz7Ybet7VrP0g2xOSrUqHpn0F0wv4VMagcN4TqbJosv1W23XZLa3QekRj3Tc5zDi/Gu6bhap+hvIF5tZ6ZiITK7jYukZa1isAjRGomQU+yl0k3/NfbTO8U1d9WEOueUrwXxx9jwMYIpYqzbZxCavoOnsKkyEFqTz6OnW8iRQjXJxbnZXLHFTLsZ15pXERsxseaOJzHCn6e2MOpyu9KR0MwQTzNqQ2BP3swcnSYHQq0b5bf+5HhEfi0lBrpEtCBIH+p3CWlFTzT//TKnZhvM2co9DiqPpt5Y3DayDTwLKDhG2/FX7tI=
secure: tCnJi3GvBS37LLBojbyPLwdJTh4xgCcs5Nn0ui0oDJUVp+NyiuAQcHAnUnIQ36M1pAeOtwBWyjawSrigqiOJ/tLLB54HMEITSbn+celb4oL04GEl2EoqDtyMjnZwrKtxWzTtGfjaycaiYUJNZRJlpyLz3Xg3DwyFWXRFRMya95jFlS+F8/kE5wzrNdV45wN+0hPKlJzaF9DtbgQBLhL0t0dZ0khBHTY7WIf7eHEYdYeGClFyzPAdLEON6CFcKkXWxn88No39T1upd7oR+k8RhsikngtkrQc2fu06F9EZFVdJVyrVSkKb+iXCzgoiOCsvyIWyH2je3gZq+vqcfBQQ2hTIrXvpq6w2vBDy30HWcTW2O7FkwgfwpH/y7d7kOZ9ZyY4cxYYIEVrq4kxHOn2cEBbKEWmlynjpKqBmHMbdVWNrG2ksIJJjBV3TumRuXNnAPNf+KnRwz8+v9j44vhMfXFlPkNsS7aS7XXV9HQvYxcFXYGFEd8Pe7CSBI7Pe+/FVVbxnmPpMjlaiMBueQjZYSn4waTB3VPtmdj0sfRxj8YmsBSFde6toZLXBq4ooLlRh7zXMRj3b7Wl84hz9cVl2x1prsq/qlcTyIv8vekDfnGOkZZvypJelV4sLbaGTrnQFnXSI97RIxQzvfLT+Od8aorX220mcsKj5Xs/gmO7s8hw=
file:
- out/gosspks-darwin-386
- out/gosspks-darwin-amd64
Expand All @@ -33,18 +55,12 @@ deploy:
on:
repo: jdel/gosspks
tags: true
- provider: bintray
file: .bintray.json
user: jdel
key:
secure: dStLPikbyz5/Y7xxdgFBU2Ca5Vc+RCppGPlUX16kAvSkH1vAZbiwXt4clrStdg5Sb+rcu4wRvccB67mFGOTCybzckxNFM0uQ9qB6SQJpmu/Irwz9JyiWlY//WY8HSdhlPPqQtiAUeIzZLyvbkztlYqSGiswDZ4rT7oGFzhtQOyr52OWIs3vUZm6DEvPknzVmV6CkYQ66DthK9gpHE4WEGLPv2Jq4zlXClxGvr80rdYKsmAOI2uslOHbIWmdCcBTRTLa9Pv8MY8b5NPgO3RuM4sBXdKdIq/JP2X8qt4BGdrLU46v/IroXnz0QS07q9XOPeTvQ7GM0KiaBost5wvd77elY82sYQ8ii12/7Vb3hefzwcxY3mWr+2WmaLr+pTZrxnlJffJQtnuTFilSPRjVVKQfrMUVzVyQGKaWjWukjhsRxbeyl3nx7eLVsem8aM2I6PZD8exsduq9smsaqDkBvStqvF7DgKe+Gvnzv8Mo2KKMH0TKOY7XaHkx+QN6GwJ0GWl/O9Mhj2MOJt7SvsT2NBQmK/1c45WsAuDj7AQ9MVxcKpWX6Cz7EYVfN8NTEFknDNiVHVy7uylZzkROtzHiR0hdJuYgc5If8eanZEX2F/F0BlXBqInuJkoKxRxXg8aY5IhvT+Lh8hPX4d5j7cVfK521sxJ+QgB1E6eu+wcnaxes=
skip_cleanup: true
on:
repo: jdel/gosspks
branch: master
notifications:
slack:
secure: roUfLYvdO1i7NDMhxzUXtzTSK4xGbpdnUO86h9Oa84PEFZbo4zrya/zevoA+mmuWOf/Wvl5crvv+0KSFcijNrwqJbzdY0Oc55JwQlel+fnoa6OBFXgSoVa0lmdFwcJN9sCHOMFfpVluCriSn7Hc1W8uFutNRUsmEiZlgN8K+Fis79D2ousXQS0ZtmxGX6Va+pyoWuW0HLHdbEtFJRdPz0BW+N5WkTmKuCvkmZgEtCRl+fYn1Bo/4y2rj+HSCEaYtihpmD1MDgxVFwc2rWfZRE5zCJowTgkHKrGOHZ3A7blyZgrrb2I9SwLqk0khSjys5GqNiqfOD7Ocp0Xjj6UWl5W3qRXbvgXNx4Vje3jR5vJJxl2NXl8iPeXVPc7GBi9MpX024kF4ZSwfecJ6gaRG2mGmukbgVa1x/RI6624szujgO2DNZCZ3Tp1mLKuj4wwik3+8EJ3MEX+MBk0f5SJNyumL6vTNICkaH5iRKajlJ4MLfIs6g5kIZftOP6sTruLtCIytajPhebVSEbfXx9XiKNR1WKNYvoXXR1uXJ3o04f9SQlLBblBIcXokSb2yNZyzzlZSLJztcR+VvHZs9bjCYKGHEJxsu3FBt7RC0dBCWGEYqvfo94rT8ypZ4nJTQfrTyPAyHUvpKDmu2dgZdIp5wtvtL7Lz+sfhtlW0x6Pw5f+4=
env:
global:
- secure: wKuKRZLlkTRbVULX9yvB1ipIBv8qtd2udJ5yXf+iI6q4jyb+MKUxLz2nYlG+95ZH10JeCCPFewkDROUIz9hHhPb8m7OdB7Q3/dQd2eSItaRlhaWNGKoVJKHfwV98P8s5Kq/0TJS2QXjuBQrhoTHtJOOC/V/NmzPUTyWecpXliSL3jm15XPi3MlG/ttd10MrqZ0zYbnyv7bG7sLuOIrKat63Wt/6pm9ftILNCfSV07jm5zHy0a/GyolsksnK5HE/+r56LAlXlxaXmev3exqd+oxTlq1r0S8GBBJJZmgXsQvvmCu+prsTeg0xHgE4Rm72SGdTktxbj+d09MACFsQ1KCrPSSIInooLXKvivD6wo35Q/94pPyxnmZvB0NtjI3Oj2ttcIF2us39pQwYQP+Bw+bX5Set36lnOZKWAUzzCi183vCDByJNHw3LX6N0s2d32zZ872HRPNGvddnBz0wU5vcaljajh/1Gtl0akiJLDYPS/lJddDkI2mvPgfW2T8Gt9LTLQsjSYM4e/sIvOn44elJ0H0TbLG7915F+bBKUgkH1xN6I4gKKYqemzW/HGyfdqPW+vBnZrFJm0u5ny83rbAsi5Zofk9dv7SgTZGnKMa29jKvjv9RaRnc8GbglqxeIZtFM/gEX5Jkg6g38SBB0ke+kchl6lI/LLe0G/QoZ8pDJc=
- secure: wKuKRZLlkTRbVULX9yvB1ipIBv8qtd2udJ5yXf+iI6q4jyb+MKUxLz2nYlG+95ZH10JeCCPFewkDROUIz9hHhPb8m7OdB7Q3/dQd2eSItaRlhaWNGKoVJKHfwV98P8s5Kq/0TJS2QXjuBQrhoTHtJOOC/V/NmzPUTyWecpXliSL3jm15XPi3MlG/ttd10MrqZ0zYbnyv7bG7sLuOIrKat63Wt/6pm9ftILNCfSV07jm5zHy0a/GyolsksnK5HE/+r56LAlXlxaXmev3exqd+oxTlq1r0S8GBBJJZmgXsQvvmCu+prsTeg0xHgE4Rm72SGdTktxbj+d09MACFsQ1KCrPSSIInooLXKvivD6wo35Q/94pPyxnmZvB0NtjI3Oj2ttcIF2us39pQwYQP+Bw+bX5Set36lnOZKWAUzzCi183vCDByJNHw3LX6N0s2d32zZ872HRPNGvddnBz0wU5vcaljajh/1Gtl0akiJLDYPS/lJddDkI2mvPgfW2T8Gt9LTLQsjSYM4e/sIvOn44elJ0H0TbLG7915F+bBKUgkH1xN6I4gKKYqemzW/HGyfdqPW+vBnZrFJm0u5ny83rbAsi5Zofk9dv7SgTZGnKMa29jKvjv9RaRnc8GbglqxeIZtFM/gEX5Jkg6g38SBB0ke+kchl6lI/LLe0G/QoZ8pDJc=
- secure: lY3/7ZKCvZcQZIDAUDhOyghTKJU84c0DyK7rhVTQnRQ3vPTqsIBaDrmEw3WXpntrSm9m9Wtbx1iJqqzssQhqgnVxrVM410EaxN05EUpwFs4u6Sod5l4xX6RrlWHeWB4MOMjgopPUIRSO7gDapacsBrCBrg1tHzRz+wegtqdE8olviSddamz7dACDujdEApeZGNPOwyr/rCRpsLxN72IjaLdQlhnwHdWqq3cgVw5ThxagglIn0qyhsDm7wovo6Mne8w9dGqFXTiB6rBRl2RAZRmzPj//ca+6em0SfSIc2/b45M53rT5uBeGI5LoVWkdZ97TOewy94cIvLrATwJXTNHFdZAwn75laPt7UllJH43XDCmIGWOQNg9OtY6iN3JJSJZ/0n7iIYWTPIYywM4lnYw9CoiI85EJfQWXRbYEwMstNp1YDL5+PXAzBvcYt5HRcFnlGbIBbI2OSGUxkU6Wpe5GPdgmE/+498lk+mJRoFIn8gQA78SK7FNckS3namVDakt15j7VJZXBPZXZDAAaB7MBgW+2MNXrkB+wm7ta9k8Ac1W4ijb4c7Kiy7JbgafntqzDcw2neIKAdM+IhwgfoVaXppjfOZ41CuegCNf6DcXdG45IILuoMt+aa68aALVTTdUYVWZ03GpPzzUxn3qZcIFYRoshbjhngbeSUHUBMervM=
- secure: UHWtJ1dp117LbHQk6frewNSUMlHoOJ1/nSSKqBFmAUOOETv6l/LP7lNzyTeCf4H+5rSEAPghGhZdQWJAklQVXSi+KPkP09dQeJP0YmBGh0392GxssphP37tnNZsoWLrcP3w8tBEemYEY5wbGypr0j41uZYPJF5QOSvX7XaC2klZs3RmfoZb2SQ7WY7CO1bHZU7s3Kor9StXAXwfJ1MWdimQGQSY+rjfERjd5PB8AkdpOJlqz8eUlFGekEhHEeo6GvNdr7nutr/QI1fDgcUyR2GzInF0kz03HIEvyZGyh3qL96Xya8vt5RrrmH1uhagZOTtcMbLwTRL7x16lGVoAY7AiHHm6ofKcq+ovlHlWhsVLY/n3G/93dvrQwzPHgORrr2Co27KrLNcv9cDsJyMX5h8sa4/cBGKkriv1WuZITp4iFJ/MEc+lmyxKVBdzcsyJXGb+GKi36wvIA+QmPmRjSi9l7RyfjHoswW89Grugvu98m2Ey60pqXi6CpimTr/07D7+2tHcfIWvJ1rhdqeQjRhMhFaPTV0NCYwGxPnYe/qcYKx2qC+BC9KKpRfW8EFT8XD/3IWAIjcjjNNW2u8r3rHz+IZ9SXyMU2gUsNP+gxyUIEIT71s1B5adzx+ftV6yKvAmtOYel9jyxOkUbiJ27x+k3y8Vg5Axx8uHOZnx/zdX8=
- secure: 3RbOFYbdUUSu+wO6YkR1OPVgrO7wh3ZUJxT0lNOEyekw1x9LO42jabXO+ZZs+poGOrxA4ZVGOaYiDjW3/v99uJ+aeo382mgbJIVYcPzvSQTCgcfN7g9OSiKB7M+XG1ACviGF6rAHciljuApPNmudhiFhQLhoGYTonwoT9PKz3tY+W9RKQ+gyzwDeUG1hz0tRI7h2YE5OmolgbOZ04NOqZq5qVcBnfNjRx5UI/JDfyCKEU5b6Ph6MfGf0ozrpcF8NolOJObtK5tJ/+Gc9d6JrIigCVwF7h7DGLesibkTfajJx6pB8XslJae1sl0V9MRvMc68QmUbpjLmkKwN03mgI4HAcF0wuWOW3Ws0xil7ANvlz6n2P1SNi0oLsFkbSBaCETB40r6ifYLJBIkbA6s2QVirr+LB8VpcmcsK2EDDO6m5akxHrAb/MV44YUIA7b3x7DCAvjfrWCePf7BVo3VAZy1gDgd5/jFXO6IpQz1SvNls6FL4vcdQqsuyjpZWMleLJkvUqcB/kmLJZ7TQQkP7yjDNrXVKS/KlDeYiP3+gVr6N+q8bXd5W9e7ELH06eyFbitKAgO3CDrQZrynOzxKohAaL7h8pVQDThY6jVRhJdu9h9tEAhFJ4PK6S2m5PoenaF7mUSFtf/ImcO9/iFnPQM0NTE7qsAsS9q/ySZM1xjl/Y=
8 changes: 4 additions & 4 deletions Dockerfile
Expand Up @@ -14,17 +14,17 @@ RUN apk add --update curl \
&& adduser gosspks -D \
&& mkdir -p /home/user/gosspks/packages /home/user/gosspks/cache \
&& chown -R user:user /tmp /home/user \
&& curl -sL https://github.com/jdel/gosspks/archive/${GOSSPKS_VERSION}.zip -o gosspks.zip \
&& curl -sL https://jdel.org/gosspks/archive/${GOSSPKS_VERSION}.zip -o gosspks.zip \
&& mkdir -p ${GOPATH}/src/github.com/jdel/ \
&& unzip gosspks.zip -d ${GOPATH}/src/github.com/jdel/ \
&& rm -f gosspks.zip \
&& mv ${GOPATH}/src/github.com/jdel/gosspks-* ${GOPATH}/src/github.com/jdel/gosspks \
&& mv ${GOPATH}/src/jdel.org/gosspks-* ${GOPATH}/src/jdel.org/gosspks \
&& go get -v github.com/golang/dep/cmd/dep \
&& cd $GOPATH/src/github.com/golang/dep/cmd/dep \
&& git checkout tags/v0.4.1 && go install \
&& cd ${GOPATH}/src/github.com/jdel/gosspks/ \
&& cd ${GOPATH}/src/jdel.org/gosspks/ \
&& dep ensure -v -vendor-only \
&& go build -o /usr/local/bin/gosspks -ldflags "-X github.com/jdel/gosspks/cfg.Version=${GOSSPKS_VERSION}-${GOSSPKS_COMMIT}" \
&& go build -o /usr/local/bin/gosspks -ldflags "-X jdel.org/gosspks/cfg.Version=${GOSSPKS_VERSION}-${GOSSPKS_COMMIT}" \
&& apk del build-dependencies \
&& rm -rf /var/cache/apk/* \
&& rm -rf /root/.glide/ \
Expand Down

0 comments on commit a085716

Please sign in to comment.