From c9d8b4f94f2693d1bd2df15867f7e6c27210980f Mon Sep 17 00:00:00 2001 From: mrz1836 Date: Mon, 27 Dec 2021 08:53:51 -0500 Subject: [PATCH] Upgraded go version to 1.16, upgraded deps --- .github/mergify.yml | 3 -- .github/workflows/run-tests.yml | 2 +- .golangci.yml | 2 +- .make/go.mk | 8 ++--- README.md | 63 ++++++++++++++++++--------------- go.mod | 4 +-- go.sum | 13 +++---- 7 files changed, 46 insertions(+), 49 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 67ecbb1..5fd99f2 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -8,7 +8,6 @@ pull_request_rules: conditions: - -draft - author~=^dependabot(|-preview)\[bot\]$ - - check-success='test (1.15.x, ubuntu-latest)' - check-success='test (1.16.x, ubuntu-latest)' - check-success='test (1.17.x, ubuntu-latest)' - check-success='Analyze (go)' @@ -22,7 +21,6 @@ pull_request_rules: - name: Alert on major version detection conditions: - author~=^dependabot(|-preview)\[bot\]$ - - check-success='test (1.15.x, ubuntu-latest)' - check-success='test (1.16.x, ubuntu-latest)' - check-success='test (1.17.x, ubuntu-latest)' - check-success='Analyze (go)' @@ -38,7 +36,6 @@ pull_request_rules: - name: Automatic Merge ⬇️ on Approval ✔ conditions: - "#approved-reviews-by>=1" - - check-success='test (1.15.x, ubuntu-latest)' - check-success='test (1.16.x, ubuntu-latest)' - check-success='test (1.17.x, ubuntu-latest)' - check-success='Analyze (go)' diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 16a3c84..88c8abb 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,7 +17,7 @@ jobs: test: strategy: matrix: - go-version: [ 1.15.x, 1.16.x, 1.17.x ] + go-version: [ 1.16.x, 1.17.x ] os: [ ubuntu-latest ] runs-on: ${{ matrix.os }} steps: diff --git a/.golangci.yml b/.golangci.yml index 179287e..fa4ee8c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -7,7 +7,7 @@ run: concurrency: 4 # timeout for analysis, e.g. 30s, 5m, default is 1m - timeout: 1m + timeout: 5m # exit code when at least one issue was found, default is 1 issues-exit-code: 1 diff --git a/.make/go.mk b/.make/go.mk index 49708b6..8ee8004 100644 --- a/.make/go.mk +++ b/.make/go.mk @@ -54,15 +54,15 @@ install-go: ## Install the application (Using Native Go) lint: ## Run the golangci-lint application (install if not found) @echo "installing golangci-lint..." @#Travis (has sudo) - @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; + @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; @#AWS CodePipeline - @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; + @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; @#Github Actions - @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; + @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; @#Brew - MacOS @if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(shell command -v brew)" != "" ]; then brew install golangci-lint; fi; @#MacOS Vanilla - @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; + @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; @echo "running golangci-lint..." @golangci-lint run --verbose diff --git a/README.md b/README.md index f6df229..ce47cfc 100644 --- a/README.md +++ b/README.md @@ -78,31 +78,36 @@ make help List of all current commands: ```text -all Runs multiple commands -clean Remove previous builds and any test cache data -clean-mods Remove all the Go mod cache -coverage Shows the test coverage -godocs Sync the latest tag with GoDocs -help Show this help message -install Install the application -install-go Install the application (Using Native Go) -lint Run the golangci-lint application (install if not found) -release Full production release (creates release in Github) -release Runs common.release then runs godocs -release-snap Test the full release (build binaries) -release-test Full production test release (everything except deploy) -replace-version Replaces the version in HTML/JS (pre-deploy) -tag Generate a new tag and push (tag version=0.0.0) -tag-remove Remove a tag if found (tag-remove version=0.0.0) -tag-update Update an existing tag to current commit (tag-update version=0.0.0) -test Runs vet, lint and ALL tests -test-ci Runs all tests via CI (exports coverage) -test-ci-no-race Runs all tests via CI (no race) (exports coverage) -test-ci-short Runs unit tests via CI (exports coverage) -test-short Runs vet, lint and tests (excludes integration tests) -uninstall Uninstall the application (and remove files) -update-linter Update the golangci-lint package (macOS only) -vet Run the Go vet application +all Runs multiple commands +clean Remove previous builds and any test cache data +clean-mods Remove all the Go mod cache +coverage Shows the test coverage +diff Show the git diff +generate Runs the go generate command in the base of the repo +godocs Sync the latest tag with GoDocs +help Show this help message +install Install the application +install-go Install the application (Using Native Go) +install-releaser Install the GoReleaser application +lint Run the golangci-lint application (install if not found) +release Full production release (creates release in Github) +release Runs common.release then runs godocs +release-snap Test the full release (build binaries) +release-test Full production test release (everything except deploy) +replace-version Replaces the version in HTML/JS (pre-deploy) +tag Generate a new tag and push (tag version=0.0.0) +tag-remove Remove a tag if found (tag-remove version=0.0.0) +tag-update Update an existing tag to current commit (tag-update version=0.0.0) +test Runs lint and ALL tests +test-ci Runs all tests via CI (exports coverage) +test-ci-no-race Runs all tests via CI (no race) (exports coverage) +test-ci-short Runs unit tests via CI (exports coverage) +test-no-lint Runs just tests +test-short Runs vet, lint and tests (excludes integration tests) +test-unit Runs tests and outputs coverage +uninstall Uninstall the application (and remove files) +update-linter Update the golangci-lint package (macOS only) +vet Run the Go vet application ``` @@ -110,7 +115,7 @@ vet Run the Go vet application ## Examples & Tests All unit tests and [examples](examples) run via [Github Actions](https://github.com/BitcoinSchema/go-aip/actions) and -uses [Go version 1.15.x](https://golang.org/doc/go1.15). View the [configuration file](.github/workflows/run-tests.yml). +uses [Go version 1.16.x](https://golang.org/doc/go1.16). View the [configuration file](.github/workflows/run-tests.yml). Run all tests (including integration tests) ```shell script @@ -144,8 +149,8 @@ Checkout all the [examples](examples)! ## Maintainers | [MrZ](https://github.com/rohenaz) | [MrZ](https://github.com/mrz1836) | -|:---:|:---:| -| [Satchmo](https://github.com/rohenaz) | [MrZ](https://github.com/mrz1836) | +|:------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------:| +| [Satchmo](https://github.com/rohenaz) | [MrZ](https://github.com/mrz1836) |
@@ -163,4 +168,4 @@ or by making a [**bitcoin donation**](https://gobitcoinsv.com/#sponsor?utm_sourc ## License -![License](https://img.shields.io/github/license/BitcoinSchema/go-aip.svg?style=flat&v=3) \ No newline at end of file +[![License](https://img.shields.io/github/license/BitcoinSchema/go-aip.svg?style=flat&v=3)](LICENSE) \ No newline at end of file diff --git a/go.mod b/go.mod index 60ac970..8f105fe 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/bitcoinschema/go-aip -go 1.15 +go 1.16 require ( github.com/bitcoinschema/go-bitcoin v0.3.20 - github.com/bitcoinschema/go-bob v0.1.8 + github.com/bitcoinschema/go-bob v0.1.9 github.com/bitcoinsv/bsvutil v0.0.0-20181216182056-1d77cf353ea9 github.com/btcsuite/btcd v0.22.0-beta github.com/libsv/go-bt v1.0.4 diff --git a/go.sum b/go.sum index 674bd48..958ee15 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,8 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= -github.com/bitcoinschema/go-bitcoin v0.3.18/go.mod h1:qugS0wUE6RKcO05lKnmSyfSwhDbuhztgh3i3UetadDs= github.com/bitcoinschema/go-bitcoin v0.3.20 h1:jWKT7ePYm4dPaIR2aIAVL8BwdsYtuG/4B87l1+KZyWs= github.com/bitcoinschema/go-bitcoin v0.3.20/go.mod h1:HyyMGUTtGE1qOgFJzCmvgsf3y55IfxJ+qLbwRm4Ski4= -github.com/bitcoinschema/go-bob v0.1.8 h1:6MxvZ9jGmWtiCvRJUMLftj61+DT1pdEwl8WM1G4nG2k= -github.com/bitcoinschema/go-bob v0.1.8/go.mod h1:BtOxC6wrypkONMFVOAiHqS2myM0qkVHx8XQhEEdwfJI= +github.com/bitcoinschema/go-bob v0.1.9 h1:CqmtSFeO6vIth9jIK2S1KTOIZA1/V4KT5+FRl4Aq02k= +github.com/bitcoinschema/go-bob v0.1.9/go.mod h1:mbsbQJyIN/OH0d/YqctTZNQU2+7qSl3DyiMEOW8DNb0= github.com/bitcoinsv/bsvd v0.0.0-20190609155523-4c29707f7173 h1:2yTIV9u7H0BhRDGXH5xrAwAz7XibWJtX2dNezMeNsUo= github.com/bitcoinsv/bsvd v0.0.0-20190609155523-4c29707f7173/go.mod h1:BZ1UcC9+tmcDEcdVXgpt13hMczwJxWzpAn68wNs7zRA= github.com/bitcoinsv/bsvlog v0.0.0-20181216181007-cb81b076bf2e h1:6f+gRvaPE/4h0g39dqTNPr9/P4mikw0aB+dhiExaWN8= @@ -37,7 +36,6 @@ github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= -github.com/libsv/go-bt v1.0.0/go.mod h1:AfXoLFYEbY/TvCq/84xTce2xGjPUuC5imokHmcykF2k= github.com/libsv/go-bt v1.0.4 h1:2Css5lfomk/J97tM5Gk56Lp+tTK6xWYnmHNc/fGO6lE= github.com/libsv/go-bt v1.0.4/go.mod h1:AfXoLFYEbY/TvCq/84xTce2xGjPUuC5imokHmcykF2k= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -54,13 +52,12 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b h1:QAqMVf3pSa6eeTsuklijukjXBlj7Es2QQplab+/RbQ4= golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -73,10 +70,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=