Skip to content

Commit

Permalink
Merge pull request #21 from pavel-v-chernykh/update-master-version-to-v4
Browse files Browse the repository at this point in the history
Update master version to v4
  • Loading branch information
pavlo-v-chernykh authored Oct 31, 2020
2 parents 3489d09 + d42885e commit 3e3bbb9
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
with:
go-version: '1.15.3'
- name: Fmt
run: go fmt github.com/pavel-v-chernykh/keystore-go/v3/...
run: go fmt github.com/pavel-v-chernykh/keystore-go/v4/...
lint:
name: Lint
runs-on: ubuntu-latest
Expand All @@ -35,4 +35,4 @@ jobs:
with:
go-version: '1.15.3'
- name: Test
run: go test -cover -count=1 -v github.com/pavel-v-chernykh/keystore-go/v3/...
run: go test -cover -count=1 -v github.com/pavel-v-chernykh/keystore-go/v4/...
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fmt:
go fmt github.com/pavel-v-chernykh/keystore-go/v3/...
go fmt github.com/pavel-v-chernykh/keystore-go/v4/...

lint:
golangci-lint run -c .golangci.yaml
Expand Down
8 changes: 3 additions & 5 deletions examples/compare/go.mod
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
module github.com/pavel-v-chernykh/keystore-go/v3/examples/compare
module github.com/pavel-v-chernykh/keystore-go/v4/examples/compare

go 1.14

require github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0
require github.com/pavel-v-chernykh/keystore-go/v4 v4.0.0

replace (
github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0 => ../..
)
replace github.com/pavel-v-chernykh/keystore-go/v4 v4.0.0 => ../..
2 changes: 1 addition & 1 deletion examples/compare/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"reflect"

"github.com/pavel-v-chernykh/keystore-go/v3"
"github.com/pavel-v-chernykh/keystore-go/v4"
)

func readKeyStore(filename string, password []byte) keystore.KeyStore {
Expand Down
6 changes: 3 additions & 3 deletions examples/keypass/go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/pavel-v-chernykh/keystore-go/v3/examples/keypass
module github.com/pavel-v-chernykh/keystore-go/v4/examples/keypass

go 1.14

require github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0
require github.com/pavel-v-chernykh/keystore-go/v4 v4.0.0

replace github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0 => ../..
replace github.com/pavel-v-chernykh/keystore-go/v4 v4.0.0 => ../..
2 changes: 1 addition & 1 deletion examples/keypass/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"os"

"github.com/pavel-v-chernykh/keystore-go/v3"
"github.com/pavel-v-chernykh/keystore-go/v4"
)

func readKeyStore(filename string, password []byte) keystore.KeyStore {
Expand Down
6 changes: 3 additions & 3 deletions examples/pem/go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/pavel-v-chernykh/keystore-go/v3/examples/pem
module github.com/pavel-v-chernykh/keystore-go/v4/examples/pem

go 1.14

require github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0
require github.com/pavel-v-chernykh/keystore-go/v4 v4.0.0

replace github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0 => ../..
replace github.com/pavel-v-chernykh/keystore-go/v4 v4.0.0 => ../..
2 changes: 1 addition & 1 deletion examples/pem/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"time"

"github.com/pavel-v-chernykh/keystore-go/v3"
"github.com/pavel-v-chernykh/keystore-go/v4"
)

func readKeyStore(filename string, password []byte) keystore.KeyStore {
Expand Down
6 changes: 3 additions & 3 deletions examples/truststore/go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/pavel-v-chernykh/keystore-go/v3/examples/truststore
module github.com/pavel-v-chernykh/keystore-go/v4/examples/truststore

go 1.14

require github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0
require github.com/pavel-v-chernykh/keystore-go/v4 v4.0.0

replace github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0 => ../..
replace github.com/pavel-v-chernykh/keystore-go/v4 v4.0.0 => ../..
2 changes: 1 addition & 1 deletion examples/truststore/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"os"

"github.com/pavel-v-chernykh/keystore-go/v3"
"github.com/pavel-v-chernykh/keystore-go/v4"
)

func readKeyStore(filename string, password []byte) keystore.KeyStore {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/pavel-v-chernykh/keystore-go/v3
module github.com/pavel-v-chernykh/keystore-go/v4

go 1.14

0 comments on commit 3e3bbb9

Please sign in to comment.