Skip to content

Commit

Permalink
Merge pull request #14 from pavel-v-chernykh/fix-go-modules-spec-comp…
Browse files Browse the repository at this point in the history
…liance-issue

Fix Go modules spec compliance issue
  • Loading branch information
pavlo-v-chernykh authored Jul 24, 2020
2 parents de138e2 + e53b955 commit 9d96101
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 23 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.14.4'
- name: Fmt
run: go fmt github.com/pavel-v-chernykh/keystore-go/...
run: go fmt github.com/pavel-v-chernykh/keystore-go/v3/...
lint:
name: Lint
runs-on: ubuntu-latest
Expand All @@ -35,4 +35,4 @@ jobs:
with:
go-version: '1.14.4'
- name: Test
run: go test -cover -count=1 -v github.com/pavel-v-chernykh/keystore-go/...
run: go test -cover -count=1 -v github.com/pavel-v-chernykh/keystore-go/v3/...
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/...
go fmt github.com/pavel-v-chernykh/keystore-go/v3/...

lint:
golangci-lint run -c .golangci.yaml
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"os"
"reflect"

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

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

go 1.13
go 1.14

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

replace github.com/pavel-v-chernykh/keystore-go => ../..
replace (
github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0 => ../..
)
1 change: 0 additions & 1 deletion examples/compare/go.sum

This file was deleted.

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"
"github.com/pavel-v-chernykh/keystore-go/v3"
)

func readKeyStore(filename string, password []byte) keystore.KeyStore {
Expand Down
8 changes: 4 additions & 4 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/examples/pem
module github.com/pavel-v-chernykh/keystore-go/v3/examples/pem

go 1.13
go 1.14

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

replace github.com/pavel-v-chernykh/keystore-go => ../..
replace github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0 => ../..
1 change: 0 additions & 1 deletion examples/pem/go.sum

This file was deleted.

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"
"github.com/pavel-v-chernykh/keystore-go/v3"
)

func readKeyStore(filename string, password []byte) keystore.KeyStore {
Expand Down
8 changes: 4 additions & 4 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/examples/truststore
module github.com/pavel-v-chernykh/keystore-go/v3/examples/truststore

go 1.13
go 1.14

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

replace github.com/pavel-v-chernykh/keystore-go => ../..
replace github.com/pavel-v-chernykh/keystore-go/v3 v3.0.0 => ../..
1 change: 0 additions & 1 deletion examples/truststore/go.sum

This file was deleted.

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"
"github.com/pavel-v-chernykh/keystore-go/v3"
)

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
module github.com/pavel-v-chernykh/keystore-go/v3

go 1.14
Empty file removed go.sum
Empty file.

0 comments on commit 9d96101

Please sign in to comment.