Skip to content

Commit 88e08d3

Browse files
committed
Upgraded to go 1.16, upgraded deps, minor updates
1 parent eb0feff commit 88e08d3

File tree

7 files changed

+49
-52
lines changed

7 files changed

+49
-52
lines changed

.github/mergify.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ pull_request_rules:
88
conditions:
99
- -draft
1010
- author~=^dependabot(|-preview)\[bot\]$
11-
- check-success='test (1.15.x, ubuntu-latest)'
1211
- check-success='test (1.16.x, ubuntu-latest)'
1312
- check-success='test (1.17.x, ubuntu-latest)'
1413
- check-success='Analyze (go)'
@@ -22,7 +21,6 @@ pull_request_rules:
2221
- name: Alert on major version detection
2322
conditions:
2423
- author~=^dependabot(|-preview)\[bot\]$
25-
- check-success='test (1.15.x, ubuntu-latest)'
2624
- check-success='test (1.16.x, ubuntu-latest)'
2725
- check-success='test (1.17.x, ubuntu-latest)'
2826
- check-success='Analyze (go)'
@@ -38,7 +36,6 @@ pull_request_rules:
3836
- name: Automatic Merge ⬇️ on Approval ✔
3937
conditions:
4038
- "#approved-reviews-by>=1"
41-
- check-success='test (1.15.x, ubuntu-latest)'
4239
- check-success='test (1.16.x, ubuntu-latest)'
4340
- check-success='test (1.17.x, ubuntu-latest)'
4441
- check-success='Analyze (go)'

.github/workflows/run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
test:
1818
strategy:
1919
matrix:
20-
go-version: [ 1.15.x, 1.16.x, 1.17.x ]
20+
go-version: [ 1.16.x, 1.17.x ]
2121
os: [ ubuntu-latest ]
2222
runs-on: ${{ matrix.os }}
2323
steps:

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ run:
77
concurrency: 4
88

99
# timeout for analysis, e.g. 30s, 5m, default is 1m
10-
timeout: 1m
10+
timeout: 5m
1111

1212
# exit code when at least one issue was found, default is 1
1313
issues-exit-code: 1

.make/go.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ install-go: ## Install the application (Using Native Go)
5454
lint: ## Run the golangci-lint application (install if not found)
5555
@echo "installing golangci-lint..."
5656
@#Travis (has sudo)
57-
@if [ "$(shell command -v golangci-lint)" = "" ] && [ $(TRAVIS) ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.42.1 && sudo cp ./bin/golangci-lint $(go env GOPATH)/bin/; fi;
57+
@if [ "$(shell command -v golangci-lint)" = "" ] && [ $(TRAVIS) ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.43.0 && sudo cp ./bin/golangci-lint $(go env GOPATH)/bin/; fi;
5858
@#AWS CodePipeline
59-
@if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(CODEBUILD_BUILD_ID)" != "" ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.42.1; fi;
59+
@if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(CODEBUILD_BUILD_ID)" != "" ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.43.0; fi;
6060
@#Github Actions
61-
@if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(GITHUB_WORKFLOW)" != "" ]; then curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b $(go env GOPATH)/bin v1.42.1; fi;
61+
@if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(GITHUB_WORKFLOW)" != "" ]; then curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b $(go env GOPATH)/bin v1.43.0; fi;
6262
@#Brew - MacOS
6363
@if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(shell command -v brew)" != "" ]; then brew install golangci-lint; fi;
6464
@#MacOS Vanilla
65-
@if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(shell command -v brew)" != "" ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- v1.42.1; fi;
65+
@if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(shell command -v brew)" != "" ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- v1.43.0; fi;
6666
@echo "running golangci-lint..."
6767
@golangci-lint run --verbose
6868

README.md

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -78,39 +78,44 @@ make help
7878

7979
List of all current commands:
8080
```text
81-
all Runs multiple commands
82-
clean Remove previous builds and any test cache data
83-
release Runs common.release then runs godocs
84-
help Show this help message
85-
release Full production release (creates release in Github)
86-
release-test Full production test release (everything except deploy)
87-
release-snap Test the full release (build binaries)
88-
replace-version Replaces the version in HTML/JS (pre-deploy)
89-
tag Generate a new tag and push (tag version=0.0.0)
90-
tag-remove Remove a tag if found (tag-remove version=0.0.0)
91-
tag-update Update an existing tag to current commit (tag-update version=0.0.0)
92-
clean-mods Remove all the Go mod cache
93-
coverage Shows the test coverage
94-
godocs Sync the latest tag with GoDocs
95-
install Install the application
96-
install-go Install the application (Using Native Go)
97-
lint Run the golangci-lint application (install if not found)
98-
test Runs vet, lint and ALL tests
99-
test-short Runs vet, lint and tests (excludes integration tests)
100-
test-ci Runs all tests via CI (exports coverage)
101-
test-ci-no-race Runs all tests via CI (no race) (exports coverage)
102-
test-ci-short Runs unit tests via CI (exports coverage)
103-
uninstall Uninstall the application (and remove files)
104-
update-linter Update the golangci-lint package (macOS only)
105-
vet Run the Go vet application
81+
all Runs multiple commands
82+
clean Remove previous builds and any test cache data
83+
clean-mods Remove all the Go mod cache
84+
coverage Shows the test coverage
85+
diff Show the git diff
86+
generate Runs the go generate command in the base of the repo
87+
godocs Sync the latest tag with GoDocs
88+
help Show this help message
89+
install Install the application
90+
install-go Install the application (Using Native Go)
91+
install-releaser Install the GoReleaser application
92+
lint Run the golangci-lint application (install if not found)
93+
release Full production release (creates release in Github)
94+
release Runs common.release then runs godocs
95+
release-snap Test the full release (build binaries)
96+
release-test Full production test release (everything except deploy)
97+
replace-version Replaces the version in HTML/JS (pre-deploy)
98+
tag Generate a new tag and push (tag version=0.0.0)
99+
tag-remove Remove a tag if found (tag-remove version=0.0.0)
100+
tag-update Update an existing tag to current commit (tag-update version=0.0.0)
101+
test Runs lint and ALL tests
102+
test-ci Runs all tests via CI (exports coverage)
103+
test-ci-no-race Runs all tests via CI (no race) (exports coverage)
104+
test-ci-short Runs unit tests via CI (exports coverage)
105+
test-no-lint Runs just tests
106+
test-short Runs vet, lint and tests (excludes integration tests)
107+
test-unit Runs tests and outputs coverage
108+
uninstall Uninstall the application (and remove files)
109+
update-linter Update the golangci-lint package (macOS only)
110+
vet Run the Go vet application
106111
```
107112
</details>
108113

109114
<br/>
110115

111116
## Examples & Tests
112117
All unit tests and [examples](examples) run via [Github Actions](https://github.com/BitcoinSchema/go-bap/actions) and
113-
uses [Go version 1.15.x](https://golang.org/doc/go1.15). View the [configuration file](.github/workflows/run-tests.yml).
118+
uses [Go version 1.16.x](https://golang.org/doc/go1.16). View the [configuration file](.github/workflows/run-tests.yml).
114119

115120
Run all tests (including integration tests)
116121
```shell script
@@ -144,8 +149,8 @@ Checkout all the [examples](examples)!
144149

145150
## Maintainers
146151
| [<img src="https://github.com/rohenaz.png" height="50" alt="MrZ" />](https://github.com/rohenaz) | [<img src="https://github.com/mrz1836.png" height="50" alt="MrZ" />](https://github.com/mrz1836) |
147-
|:---:|:---:|
148-
| [Satchmo](https://github.com/rohenaz) | [MrZ](https://github.com/mrz1836) |
152+
|:------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------:|
153+
| [Satchmo](https://github.com/rohenaz) | [MrZ](https://github.com/mrz1836) |
149154

150155
<br/>
151156

@@ -167,4 +172,4 @@ or by making a [**bitcoin donation**](https://gobitcoinsv.com/#sponsor?utm_sourc
167172

168173
## License
169174

170-
![License](https://img.shields.io/github/license/BitcoinSchema/go-bap.svg?style=flat&v=3)
175+
[![License](https://img.shields.io/github/license/BitcoinSchema/go-bap.svg?style=flat&v=3)](LICENSE)

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/bitcoinschema/go-bap
22

3-
go 1.15
3+
go 1.16
44

55
require (
6-
github.com/bitcoinschema/go-aip v0.1.7
6+
github.com/bitcoinschema/go-aip v0.1.8
77
github.com/bitcoinschema/go-bitcoin v0.3.20
8-
github.com/bitcoinschema/go-bob v0.1.8
8+
github.com/bitcoinschema/go-bob v0.1.9
99
github.com/bitcoinsv/bsvutil v0.0.0-20181216182056-1d77cf353ea9
1010
github.com/libsv/go-bt v1.0.4
1111
)

go.sum

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
2-
github.com/bitcoinschema/go-aip v0.1.7 h1:hl+zrhJau0Ena4ftmIlcNowTwVNdI6/2n03GHxD2zpc=
3-
github.com/bitcoinschema/go-aip v0.1.7/go.mod h1:7gyEB5tYYnb+5g6Rxz6ESxSK6jV69nZZ3d+eo1AA+o8=
4-
github.com/bitcoinschema/go-bitcoin v0.3.18/go.mod h1:qugS0wUE6RKcO05lKnmSyfSwhDbuhztgh3i3UetadDs=
2+
github.com/bitcoinschema/go-aip v0.1.8 h1:6DwgNWH9ZBltmCFtF9sdOduJD34VX9rKfg3pLWauaJk=
3+
github.com/bitcoinschema/go-aip v0.1.8/go.mod h1:9v4yGgPYGfpgqCCMhIuJOaRemECw3zLlOyxEB8u4yys=
54
github.com/bitcoinschema/go-bitcoin v0.3.20 h1:jWKT7ePYm4dPaIR2aIAVL8BwdsYtuG/4B87l1+KZyWs=
65
github.com/bitcoinschema/go-bitcoin v0.3.20/go.mod h1:HyyMGUTtGE1qOgFJzCmvgsf3y55IfxJ+qLbwRm4Ski4=
7-
github.com/bitcoinschema/go-bob v0.1.8 h1:6MxvZ9jGmWtiCvRJUMLftj61+DT1pdEwl8WM1G4nG2k=
8-
github.com/bitcoinschema/go-bob v0.1.8/go.mod h1:BtOxC6wrypkONMFVOAiHqS2myM0qkVHx8XQhEEdwfJI=
6+
github.com/bitcoinschema/go-bob v0.1.9 h1:CqmtSFeO6vIth9jIK2S1KTOIZA1/V4KT5+FRl4Aq02k=
7+
github.com/bitcoinschema/go-bob v0.1.9/go.mod h1:mbsbQJyIN/OH0d/YqctTZNQU2+7qSl3DyiMEOW8DNb0=
98
github.com/bitcoinsv/bsvd v0.0.0-20190609155523-4c29707f7173 h1:2yTIV9u7H0BhRDGXH5xrAwAz7XibWJtX2dNezMeNsUo=
109
github.com/bitcoinsv/bsvd v0.0.0-20190609155523-4c29707f7173/go.mod h1:BZ1UcC9+tmcDEcdVXgpt13hMczwJxWzpAn68wNs7zRA=
1110
github.com/bitcoinsv/bsvlog v0.0.0-20181216181007-cb81b076bf2e h1:6f+gRvaPE/4h0g39dqTNPr9/P4mikw0aB+dhiExaWN8=
@@ -39,7 +38,6 @@ github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M
3938
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
4039
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
4140
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
42-
github.com/libsv/go-bt v1.0.0/go.mod h1:AfXoLFYEbY/TvCq/84xTce2xGjPUuC5imokHmcykF2k=
4341
github.com/libsv/go-bt v1.0.4 h1:2Css5lfomk/J97tM5Gk56Lp+tTK6xWYnmHNc/fGO6lE=
4442
github.com/libsv/go-bt v1.0.4/go.mod h1:AfXoLFYEbY/TvCq/84xTce2xGjPUuC5imokHmcykF2k=
4543
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -56,13 +54,12 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
5654
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
5755
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
5856
golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
59-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
60-
golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b h1:QAqMVf3pSa6eeTsuklijukjXBlj7Es2QQplab+/RbQ4=
6157
golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
58+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
59+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
6260
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
6361
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
6462
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
65-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
6663
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
6764
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6865
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -75,10 +72,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
7572
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
7673
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
7774
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
78-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
7975
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
8076
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
81-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
8277
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
8378
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
8479
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=

0 commit comments

Comments
 (0)