Merge pull request #21 from essentialkaos/develop

Version 3.3.1
essentialkaos · Jun 22, 2021 · 5972a45 · 5972a45
2 parents a6d746a + 663f455
commit 5972a45
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.14.x', '1.15.x' ]
+        go: [ '1.15.x', '1.16.x' ]
 
     steps:
       - name: Set up Go
@@ -36,9 +36,8 @@ jobs:
         with:
           path: ${{env.SRC_DIR}}
 
-      - name: Download dependencies
-        working-directory: ${{env.SRC_DIR}}
-        run: make deps-test
+      - name: Fix problems with go.mod
+        run: go env -w GOFLAGS=-mod=mod
 
       - name: Run tests
         working-directory: ${{env.SRC_DIR}}

diff --git a/Makefile b/Makefile
@@ -1,26 +1,28 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 1.3.0 using next command:
-# gomakegen .
+# This Makefile generated by GoMakeGen 1.3.2 using next command:
+# gomakegen --mod .
 #
 # More info: https://kaos.sh/gomakegen
 
 ################################################################################
 
+export GO111MODULE=on
+
 .DEFAULT_GOAL := help
-.PHONY = fmt vet git-config deps-test test help
+.PHONY = fmt vet test mod-init mod-update help
 
 ################################################################################
 
-git-config: ## Configure git redirects for stable import path services
-	git config --global http.https://pkg.re.followRedirects true
-
-deps-test: git-config ## Download dependencies for tests
-	go get -d -v pkg.re/check.v1
-
 test: ## Run tests
 	go test -covermode=count .
 
+mod-init: ## Initialize new module
+	go mod init
+
+mod-update: ## Download modules to local cache
+	go mod download
+
 fmt: ## Format source code with gofmt
 	find . -name "*.go" -exec gofmt -s -w {} \;
 
@@ -32,6 +34,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.0\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 1.3.2\033[0m\n'
 
 ################################################################################
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 <p align="center"><a href="#readme"><img src="https://gh.kaos.st/go-linenoise.svg"/></a></p>
 
 <p align="center">
-  <a href="https://pkg.go.dev/pkg.re/essentialkaos/go-linenoise.v3"><img src="https://gh.kaos.st/godoc.svg" alt="PkgGoDev"></a>
-  <a href="https://goreportcard.com/report/github.com/essentialkaos/go-linenoise"><img src="https://goreportcard.com/badge/github.com/essentialkaos/go-linenoise"></a>
-  <a href="https://github.com/essentialkaos/go-linenoise/actions"><img src="https://github.com/essentialkaos/go-linenoise/workflows/CI/badge.svg" alt="GitHub Actions Status" /></a>
-  <a href="https://github.com/essentialkaos/go-linenoise/actions?query=workflow%3ACodeQL"><img src="https://github.com/essentialkaos/go-linenoise/workflows/CodeQL/badge.svg" /></a>
-  <a href="https://codebeat.co/projects/github-com-essentialkaos-go-linenoise"><img alt="codebeat badge" src="https://codebeat.co/badges/f7800a13-657f-4be9-a359-2845f3433588" /></a>
-  <a href="https://github.com/essentialkaos/go-linenoise/blob/master/LICENSE"><img src="https://gh.kaos.st/bsd.svg"></a>
+  <a href="https://kaos.sh/g/go-linenoise"><img src="https://gh.kaos.st/godoc.svg" alt="PkgGoDev"></a>
+  <a href="https://kaos.sh/w/aligo/ci"><img src="https://kaos.sh/w/aligo/ci.svg" alt="GitHub Actions CI Status" /></a>
+  <a href="https://kaos.sh/r/aligo"><img src="https://kaos.sh/r/aligo.svg" alt="GoReportCard" /></a>
+  <a href="https://kaos.sh/b/aligo"><img src="https://codebeat.co/badges/f7800a13-657f-4be9-a359-2845f3433588" alt="codebeat badge" /></a>
+  <a href="https://kaos.sh/w/aligo/codeql"><img src="https://kaos.sh/w/aligo/codeql.svg" alt="GitHub Actions CodeQL Status" /></a>
+  <a href="#license"><img src="https://gh.kaos.st/bsd.svg"></a>
 </p>
 
 <p align="center"><a href="#installation">Installation</a> • <a href="#example">Example</a> • <a href="#build-status">Build Status</a> • <a href="#license">License</a></p>
@@ -22,13 +22,13 @@ This is fork of [go.linenoise](https://github.com/GeertJohan/go.linenoise) packa
 For install, do:
 
 ```
-go get pkg.re/essentialkaos/go-linenoise.v3
+go get github.com/essentialkaos/go-linenoise
 ```
 
 For update to latest stable release, do:
 
 ```
-go get -u pkg.re/essentialkaos/go-linenoise.v3
+go get -u github.com/essentialkaos/go-linenoise
 ```
 
 ### Example
@@ -41,7 +41,7 @@ package main
 import (
   "fmt"
 
-  "pkg.re/essentialkaos/go-linenoise.v3"
+  "github.com/essentialkaos/go-linenoise"
 )
 
 // ////////////////////////////////////////////////////////////////////////// //
@@ -63,8 +63,8 @@ func main() {
 
 | Branch | Status |
 |--------|--------|
-| `master` | [![CI](https://github.com/essentialkaos/go-linenoise/workflows/CI/badge.svg?branch=master)](https://github.com/essentialkaos/go-linenoise/actions) |
-| `develop` | [![CI](https://github.com/essentialkaos/go-linenoise/workflows/CI/badge.svg?branch=develop)](https://github.com/essentialkaos/go-linenoise/actions) |
+| `master` | [![CI](https://kaos.sh/w/go-linenoise/ci.svg?branch=master)](https://kaos.sh/w/go-linenoise/ci?query=branch:master) |
+| `develop` | [![CI](https://kaos.sh/w/go-linenoise/ci.svg?branch=develop)](https://kaos.sh/w/go-linenoise/ci?query=branch:develop) |
 
 ### License
 All code in this repository is licensed under a BSD license.

diff --git a/go.mod b/go.mod
@@ -0,0 +1,5 @@
+module github.com/essentialkaos/go-linenoise
+
+go 1.15
+
+require github.com/essentialkaos/check v0.0.0-20210622223336-199db74fb9fd
diff --git a/go.sum b/go.sum
@@ -0,0 +1,5 @@
+github.com/essentialkaos/check v0.0.0-20210622223336-199db74fb9fd h1:nKzk2V+/UMaGvLx9IuArSaVA3tgF9wQ0DpbiEI349Jo=
+github.com/essentialkaos/check v0.0.0-20210622223336-199db74fb9fd/go.mod h1:8jQlJQ3XxBd9PcFo1JUItObqyMUXADZ+kly0Q3lgDaQ=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
diff --git a/linenoise.go b/linenoise.go
@@ -28,7 +28,7 @@ import (
 // ///////////////////////////////////////////////////////////////////////////////// //
 
 // VERSION is current version of go-linenoise package
-const VERSION = "3.3.0"
+const VERSION = "3.3.1"
 
 // ///////////////////////////////////////////////////////////////////////////////// //
 

diff --git a/linenoise_test.go b/linenoise_test.go
@@ -5,7 +5,7 @@ package linenoise
 import (
 	"testing"
 
-	. "pkg.re/check.v1"
+	. "github.com/essentialkaos/check"
 )
 
 // ////////////////////////////////////////////////////////////////////////////////// //