repo: update repo to use gha, newer go, etc (#7)

shoenig · web-flow · commit 1e3f81f2a403 · 2022-10-08T09:11:09.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,17 @@
+name: run-ci
+on: [push]
+jobs:
+  run-tests:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v2
+        with:
+          stable: true
+          go-version: 1.18.7
+      - name: Vet
+        run: |
+          make vet
+      - name: Tests
+        run: |
+          make test
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 *~
-bcrypt-tool
 **/*.snap
 
+bcrypt-tool
+output/
+dist/
diff --git a/.travis.yml b/.travis.yml
diff --git a/Makefile b/Makefile
@@ -0,0 +1,17 @@
+.PHONY: build
+build: clean
+	CGO_ENABLED=0 go build -o output/bcrypt-tool
+
+.PHONY: clean
+clean:
+	rm -f output/bcrypt-tool
+
+.PHONY: test
+test:
+	go test -race ./...
+
+.PHONY: vet
+vet:
+	go vet ./...
+
+default: build
diff --git a/OSSMETADATA b/OSSMETADATA
diff --git a/README.md b/README.md
@@ -3,17 +3,13 @@ bcrypt-tool
 
 `bcrypt-tool` is a dandy CLI tool for generating and matching bcrypt hashes
 
-[![Go Report Card](https://goreportcard.com/badge/gophers.dev/cmds/bcrypt-tool)](https://goreportcard.com/report/gophers.dev/cmds/bcrypt-tool)
-[![Build Status](https://travis-ci.com/shoenig/bcrypt-tool.svg?branch=master)](https://travis-ci.com/shoenig/bcrypt-tool)
-[![GoDoc](https://godoc.org/gophers.dev/cmds/bcrypt-tool?status.svg)](https://godoc.org/gophers.dev/cmds/bcrypt-tool)
-[![NetflixOSS Lifecycle](https://img.shields.io/osslifecycle/shoenig/bcrypt-tool.svg)](OSSMETADATA)
 [![GitHub](https://img.shields.io/github/license/shoenig/bcrypt-tool.svg)](LICENSE)
 
 [![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-white.svg)](https://snapcraft.io/bcrypt-tool)
 
 # Project Overview
 
-Module `gophers.dev/cmds/bcrypt-tool` provides a simple command line tool.
+Module `github.com/shoenig/bcrypt-tool` provides a simple command line tool.
 
 # Getting Started
 
@@ -26,7 +22,7 @@ $ sudo snap install bcrypt-tool
 #### Build from source
 The `bcrypt-tool` command can be compiled by running
 ```bash
-$ go get gophers.dev/cmds/bcrypt-tool
+$ go get github.com/shoenig/bcrypt-tool
 ```
 
 ### Examples
@@ -70,9 +66,9 @@ bcrypt-tool [action] parameter ...
 
 # Contributing
 
-The `gophers.dev/cmds/bcrypt-tool` module is always improving with new features
+The `github.com/shoenig/bcrypt-tool` module is always improving with new features
 and error corrections. For contributing bug fixes and new features please file an issue.
 
 # License
 
-The `gophers.dev/cmds/bcrypt-tool` module is open source under the [MIT](LICENSE) license.
+The `github.com/shoenig/bcrypt-tool` module is open source under the [MIT](LICENSE) license.
diff --git a/go.mod b/go.mod
@@ -1,5 +1,5 @@
-module gophers.dev/cmds/bcrypt-tool
+module github.com/shoenig/bcrypt-tool
 
-go 1.16
+go 1.19
 
-require golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc
+require golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b
diff --git a/go.sum b/go.sum
@@ -1,7 +1,2 @@
-golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc h1:+q90ECDSAQirdykUN6sPEiBXBsp8Csjcca8Oy7bgLTA=
-golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b h1:huxqepDufQpLLIRXiVkTvnxrzJlpwmIWAObmcCcUFr0=
+golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
diff --git a/main.go b/main.go
@@ -17,8 +17,7 @@ const (
     hash  [password] <cost> Generate hash given password and optional cost (4-31)
     match [password] [hash] Print "yes" and return 0 if password is a match
                             for hash, or print "no" and return 1 otherwise 
-    cost  [hash]            Print the cost of hash (4-31)
-`
+    cost  [hash]            Print the cost of hash (4-31)`
 )
 
 func main() {

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,7 @@ const (`
`17`	`17`	`hash [password] <cost> Generate hash given password and optional cost (4-31)`
`18`	`18`	`match [password] [hash] Print "yes" and return 0 if password is a match`
`19`	`19`	`for hash, or print "no" and return 1 otherwise`
`20`		`- cost [hash] Print the cost of hash (4-31)`
`21`		-`
	`20`	+ cost [hash] Print the cost of hash (4-31)`
`22`	`21`	`)`
`23`	`22`
`24`	`23`	`func main() {`