Skip to content

Commit

Permalink
Rename module to be able to use from other modules without 'replace'
Browse files Browse the repository at this point in the history
  • Loading branch information
vassilvk committed Mar 10, 2024
1 parent ce83d9e commit d1a6d46
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 32 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
path: ${{ github.workspace }}/go/src/gopkg.in/yaml.v3
path: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml.v3
- name: Set up Go ${{ matrix.go }}
if: matrix.go != 'tip'
uses: actions/setup-go@v2
Expand Down Expand Up @@ -56,6 +56,6 @@ jobs:
echo "$GOROOT/bin" >> $GITHUB_PATH
- run: go version
- run: go get -t ./...
working-directory: ${{ github.workspace }}/go/src/gopkg.in/yaml.v3
working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml.v3
- run: go test .
working-directory: ${{ github.workspace }}/go/src/gopkg.in/yaml.v3
working-directory: ${{ github.workspace }}/go/src/github.com/zillow/go-yaml.v3
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ supported since they're a poor design and are gone in YAML 1.2.
Installation and usage
----------------------

The import path for the package is *gopkg.in/yaml.v3*.
The import path for the package is *github.com/zillow/go-yaml.v3*.

To install it, run:

go get gopkg.in/yaml.v3
go get github.com/zillow/go-yaml.v3

API documentation
-----------------

If opened in a browser, the import path itself leads to the API documentation:

- [https://gopkg.in/yaml.v3](https://gopkg.in/yaml.v3)
- [https://github.com/zillow/go-yaml.v3](https://github.com/zillow/go-yaml.v3)

API stability
-------------
Expand All @@ -72,7 +72,7 @@ import (
"fmt"
"log"

"gopkg.in/yaml.v3"
"github.com/zillow/go-yaml.v3"
)

var data = `
Expand Down
2 changes: 1 addition & 1 deletion decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"time"

"github.com/zillow/go-yaml.v3"
. "gopkg.in/check.v1"
"gopkg.in/yaml.v3"
)

var unmarshalIntTest = 123
Expand Down
2 changes: 1 addition & 1 deletion encode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"net"
"os"

"github.com/zillow/go-yaml.v3"
. "gopkg.in/check.v1"
"gopkg.in/yaml.v3"
)

type jsonNumberT string
Expand Down
2 changes: 1 addition & 1 deletion example_embedded_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"
"log"

"gopkg.in/yaml.v3"
"github.com/zillow/go-yaml.v3"
)

// An example showing how to unmarshal embedded
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module "gopkg.in/yaml.v3"
module "github.com/zillow/go-yaml.v3"

require (
"gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405
Expand Down
2 changes: 1 addition & 1 deletion limit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strings"
"testing"

"github.com/zillow/go-yaml.v3"
. "gopkg.in/check.v1"
"gopkg.in/yaml.v3"
)

var limitTests = []struct {
Expand Down
41 changes: 21 additions & 20 deletions node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ import (
"fmt"
"os"

. "gopkg.in/check.v1"
"gopkg.in/yaml.v3"
"io"
"strings"

"github.com/zillow/go-yaml.v3"
. "gopkg.in/check.v1"
)

var nodeTests = []struct {
Expand Down Expand Up @@ -688,17 +689,17 @@ var nodeTests = []struct {
Line: 3,
Column: 4,
}, {
Kind: yaml.ScalarNode,
Tag: "!!str",
Value: "c",
Kind: yaml.ScalarNode,
Tag: "!!str",
Value: "c",
LineComment: "# IC",
Line: 5,
Column: 1,
Line: 5,
Column: 1,
}, {
Kind: yaml.SequenceNode,
Tag: "!!seq",
Line: 6,
Column: 3,
Kind: yaml.SequenceNode,
Tag: "!!seq",
Line: 6,
Column: 3,
Content: []*yaml.Node{{
Kind: yaml.ScalarNode,
Tag: "!!str",
Expand All @@ -707,17 +708,17 @@ var nodeTests = []struct {
Column: 5,
}},
}, {
Kind: yaml.ScalarNode,
Tag: "!!str",
Value: "d",
Kind: yaml.ScalarNode,
Tag: "!!str",
Value: "d",
LineComment: "# ID",
Line: 7,
Column: 1,
Line: 7,
Column: 1,
}, {
Kind: yaml.MappingNode,
Tag: "!!map",
Line: 8,
Column: 3,
Kind: yaml.MappingNode,
Tag: "!!map",
Line: 8,
Column: 3,
Content: []*yaml.Node{{
Kind: yaml.ScalarNode,
Tag: "!!str",
Expand Down

0 comments on commit d1a6d46

Please sign in to comment.