diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f7c9d9..a217a28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - go: [ '1.16.x', '1.17.x' ] + go: [ '1.17.x', '1.18.x' ] steps: - name: Set up Go @@ -32,7 +32,7 @@ jobs: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ${{env.SRC_DIR}} @@ -60,7 +60,7 @@ jobs: run: goveralls -service github -coverprofile cover.out - name: Set up Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '14.x' @@ -88,7 +88,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: '1.16.x' + go-version: '1.17.x' id: go - name: Setup PATH @@ -98,7 +98,7 @@ jobs: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ${{env.SRC_DIR}} diff --git a/.github/workflows/godoc.yml b/.github/workflows/godoc.yml index 8bf64c0..d789613 100644 --- a/.github/workflows/godoc.yml +++ b/.github/workflows/godoc.yml @@ -10,4 +10,4 @@ jobs: steps: - name: Trigger GoSumDB and PkgGoDev - uses: essentialkaos/pkgre-godoc-action@v1 + uses: essentialkaos/godoc-action@v1 diff --git a/Makefile b/Makefile index 31f1dc4..c0abcbb 100644 --- a/Makefile +++ b/Makefile @@ -1,30 +1,36 @@ ################################################################################ -# This Makefile generated by GoMakeGen 1.3.2 using next command: -# gomakegen . +# This Makefile generated by GoMakeGen 1.5.1 using next command: +# gomakegen --mod . # # More info: https://kaos.sh/gomakegen ################################################################################ +export GO111MODULE=on + .DEFAULT_GOAL := help -.PHONY = fmt vet git-config deps deps-test test help +.PHONY = fmt vet deps deps-test test mod-init mod-update mod-vendor help ################################################################################ -git-config: ## Configure git redirects for stable import path services - git config --global http.https://pkg.re.followRedirects true - -deps: git-config ## Download dependencies - go get -d -v github.com/golang/freetype - go get -d -v golang.org/x/image/font +deps: mod-update ## Download dependencies -deps-test: git-config ## Download dependencies for tests - go get -d -v pkg.re/essentialkaos/check.v1 +deps-test: deps ## Download dependencies for tests test: ## Run tests go test -covermode=count . +mod-init: ## Initialize new module + go mod init + go mod tidy + +mod-update: ## Download modules to local cache + go mod download + +mod-vendor: ## Make vendored copy of dependencies + go mod vendor + fmt: ## Format source code with gofmt find . -name "*.go" -exec gofmt -s -w {} \; @@ -36,6 +42,6 @@ help: ## Show this info @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \ | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 1.3.2\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n' ################################################################################ diff --git a/README.md b/README.md index cd3f5d1..771a7ac 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
- + @@ -18,16 +18,16 @@ ### Installation -Make sure you have a working Go 1.16+ workspace (_[instructions](https://golang.org/doc/install)_), then: +Make sure you have a working Go 1.17+ workspace (_[instructions](https://golang.org/doc/install)_), then: ````bash -go get -d pkg.re/essentialkaos/go-badge.v1 +go get -d github.com/essentialkaos/go-badge ```` For update to latest stable release, do: ```bash -go get -d -u pkg.re/essentialkaos/go-badge.v1 +go get -d -u github.com/essentialkaos/go-badge ``` ### Usage example @@ -39,7 +39,7 @@ package main import ( "fmt" - "pkg.re/essentialkaos/go-badge.v1" + "github.com/essentialkaos/go-badge" ) // ////////////////////////////////////////////////////////////////////////// // diff --git a/badge_test.go b/badge_test.go index bffe0c8..d510b04 100644 --- a/badge_test.go +++ b/badge_test.go @@ -11,7 +11,7 @@ import ( "io/ioutil" "testing" - . "pkg.re/essentialkaos/check.v1" + . "github.com/essentialkaos/check" ) // ////////////////////////////////////////////////////////////////////////////////// //