Skip to content

Commit a2ff65d

Browse files
mattwynneaurelien-reeves
mattwynne
and
aurelien-reeves
authored
Use VCS module paths in Go reference from Gherkin => Messages (#1608)
* Also rebuild go packages if go.mod changes * Attempt to use a VCS path to reference gherkin->messages in Go * Point go module paths to monorepo Ref #1550 Co-authored-by: Aurelien Reeves <[email protected]> * Update Go module refs from gherkin->messages Ref: #1550 NB: Until #1608 has been merged to main, we're using a temporary branch ref in go.mod. This will need to be removed before this PR is merged. * Update Go module refs from demo-formatter -> messages Ref #1550 * Update Go module refs from json-formatter -> messages Ref #1550 * Fix Go module self-references * Use main branch again in Go module refs Co-authored-by: Aurelien Reeves <[email protected]>
1 parent 4ecd6cf commit a2ff65d

23 files changed

+30
-25
lines changed

‎demo-formatter/go/cucumber_demo_formatter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package cucumber_demo_formatter
88
import (
99
"encoding/json"
1010
"fmt"
11-
"github.com/cucumber/messages-go/v16"
11+
"github.com/cucumber/common/messages/go/v16"
1212
"io"
1313
)
1414

‎demo-formatter/go/cucumber_demo_formatter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cucumber_demo_formatter
33
import (
44
"bytes"
55
"encoding/json"
6-
"github.com/cucumber/messages-go/v16"
6+
"github.com/cucumber/common/messages/go/v16"
77
"github.com/stretchr/testify/require"
88
"testing"
99
)

‎demo-formatter/go/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/cucumber/common/demo-formatter/go
22

33
require (
4-
github.com/cucumber/messages-go/v16 v16.0.1
4+
github.com/cucumber/common/messages/go/v16 v16.0.0
55
github.com/stretchr/testify v1.7.0
66
)
77

8-
replace github.com/cucumber/messages-go/v16 => ../../messages/go
8+
replace github.com/cucumber/common/messages/go/v16 => ../../messages/go
99

1010
go 1.13

‎gherkin/go/astbuilder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gherkin
22

33
import (
4-
"github.com/cucumber/messages-go/v16"
4+
"github.com/cucumber/common/messages/go/v16"
55
"strings"
66
)
77

‎gherkin/go/bench_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gherkin
22

33
import (
4-
messages "github.com/cucumber/messages-go/v16"
4+
messages "github.com/cucumber/common/messages/go/v16"
55
"strings"
66
"testing"
77
)

‎gherkin/go/cmd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"flag"
1111
"fmt"
1212
"github.com/cucumber/common/gherkin/go/v19"
13-
"github.com/cucumber/messages-go/v16"
13+
"github.com/cucumber/common/messages/go/v16"
1414
"os"
1515
)
1616

‎gherkin/go/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package gherkin
22

33
import (
44
"fmt"
5-
messages "github.com/cucumber/messages-go/v16"
5+
messages "github.com/cucumber/common/messages/go/v16"
66
"os"
77
"strings"
88
)

‎gherkin/go/gherkin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gherkin
33
import (
44
"bufio"
55
"fmt"
6-
"github.com/cucumber/messages-go/v16"
6+
"github.com/cucumber/common/messages/go/v16"
77
"io"
88
"strings"
99
)

‎gherkin/go/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/cucumber/common/gherkin/go/v19
22

33
require (
4-
github.com/cucumber/messages-go/v16 v16.0.1
4+
github.com/cucumber/common/messages/go/v16 v16.0.0
55
github.com/stretchr/testify v1.7.0
66
)
77

8-
replace github.com/cucumber/messages-go/v16 => ../../messages/go
8+
replace github.com/cucumber/common/messages/go/v16 => ../../messages/go
99

1010
go 1.13

‎gherkin/go/go.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
github.com/cucumber/common/messages/go/v16 v16.0.0-20210616143200-16b27f1a25b2/go.mod h1:M2BQJNS63rzmxaz/VgU6US/REUbAeROGJ6QdntfY98Y=
2+
github.com/cucumber/gherkin-go v5.1.0+incompatible h1:RCvyVI6KQLI2IJkijZBeJcE4K3U7DnhQ1RjD7VV+AIk=
3+
github.com/cucumber/gherkin-go/v19 v19.0.3 h1:mMSKu1077ffLbTJULUfM5HPokgeBcIGboyeNUof1MdE=
4+
github.com/cucumber/gherkin-go/v19 v19.0.3/go.mod h1:jY/NP6jUtRSArQQJ5h1FXOUgk5fZK24qtE7vKi776Vw=
5+
github.com/cucumber/messages-go v3.0.0+incompatible h1:IIZ+6dRebLcM80cStIDad0Wr6ipgs4zYGMqNH0kp7pY=
16
github.com/cucumber/messages-go/v16 v16.0.0 h1:3QR8gAu6JYUI8U7gVUMZs/m+C0ZlBcTwf2QKCHMDH88=
27
github.com/cucumber/messages-go/v16 v16.0.0/go.mod h1:EJcyR5Mm5ZuDsKJnT2N9KRnBK30BGjtYotDKpwQ0v6g=
38
github.com/cucumber/messages-go/v16 v16.0.1 h1:fvkpwsLgnIm0qugftrw2YwNlio+ABe2Iu94Ap8GMYIY=

‎gherkin/go/messages.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gherkin
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/cucumber/messages-go/v16"
6+
"github.com/cucumber/common/messages/go/v16"
77
"io"
88
"io/ioutil"
99
"strings"

‎gherkin/go/messages_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gherkin
33
import (
44
"bytes"
55
"encoding/json"
6-
"github.com/cucumber/messages-go/v16"
6+
"github.com/cucumber/common/messages/go/v16"
77
"github.com/stretchr/testify/assert"
88
"github.com/stretchr/testify/require"
99
"testing"

‎gherkin/go/pickles.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gherkin
22

33
import (
4-
"github.com/cucumber/messages-go/v16"
4+
"github.com/cucumber/common/messages/go/v16"
55
"strings"
66
)
77

‎gherkin/go/pickles_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gherkin
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/cucumber/messages-go/v16"
6+
"github.com/cucumber/common/messages/go/v16"
77
"os"
88
"strings"
99
)

‎json-formatter/go/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/cucumber/common/json-formatter/go/v18
22

3-
replace github.com/cucumber/messages-go/v16 => ../../messages/go
3+
replace github.com/cucumber/common/messages/go/v16 => ../../messages/go
44

55
go 1.13
66

77
require (
8-
github.com/cucumber/messages-go/v16 v16.0.1
8+
github.com/cucumber/common/messages/go/v16 v16.0.1
99
github.com/onsi/ginkgo v1.16.4
1010
github.com/onsi/gomega v1.13.0
1111
)

‎json-formatter/go/json.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"io"
77
"strings"
88

9-
"github.com/cucumber/messages-go/v16"
9+
"github.com/cucumber/common/messages/go/v16"
1010
)
1111

1212
type Formatter struct {

‎json-formatter/go/message_lookup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package json
33
import (
44
"fmt"
55

6-
"github.com/cucumber/messages-go/v16"
6+
"github.com/cucumber/common/messages/go/v16"
77
)
88

99
type MessageLookup struct {

‎json-formatter/go/message_lookup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package json
22

33
import (
4-
"github.com/cucumber/messages-go/v16"
4+
"github.com/cucumber/common/messages/go/v16"
55

66
. "github.com/onsi/ginkgo"
77
. "github.com/onsi/gomega"

‎json-formatter/go/test_case.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/cucumber/messages-go/v16"
8+
"github.com/cucumber/common/messages/go/v16"
99
)
1010

1111
type TestCase struct {

‎json-formatter/go/test_case_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package json
22

33
import (
4-
"github.com/cucumber/messages-go/v16"
4+
"github.com/cucumber/common/messages/go/v16"
55
. "github.com/onsi/ginkgo"
66
. "github.com/onsi/gomega"
77
)

‎json-formatter/go/test_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package json
22

33
import (
4-
"github.com/cucumber/messages-go/v16"
4+
"github.com/cucumber/common/messages/go/v16"
55
)
66

77
func makeScenario(id string, steps []*messages.Step) *messages.Scenario {

‎json-formatter/go/test_step.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"strings"
88

9-
"github.com/cucumber/messages-go/v16"
9+
"github.com/cucumber/common/messages/go/v16"
1010
)
1111

1212
type TestStep struct {

‎json-formatter/go/test_step_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package json
22

33
import (
4-
"github.com/cucumber/messages-go/v16"
4+
"github.com/cucumber/common/messages/go/v16"
55
. "github.com/onsi/ginkgo"
66
. "github.com/onsi/gomega"
77
)

0 commit comments

Comments
 (0)