Skip to content

Commit 091a26b

Browse files
Prometheus2677FPiety0521
authored andcommitted
Revert "Remove support for Go modules"
This reverts commit 5e96539f55495f6fa80240037db6cb1886a99b89.
1 parent b71fc30 commit 091a26b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+342
-96
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ go_import_path: github.com/golang-migrate/migrate
1414

1515
env:
1616
global:
17+
- GO111MODULE=on
1718
- MIGRATE_TEST_CONTAINER_BOOT_TIMEOUT=60
1819
- DOCKER_USERNAME=golangmigrate
1920
- secure: "oSOznzUrgr5h45qW4PONkREpisPAt40tnM+KFWtS/Ggu5UI2Ie0CmyYXWuBjbt7B97a4yN9Qzmn8FxJHJ7kk+ABOi3muhkxeIhr6esXbzHhX/Jhv0mj1xkzX7KoVN9oHBz3cOI/QeRyEAO68xjDHNE2kby4RTT9VBt6TQUakKVkqI5qkqLBTADepCjVC+9XhxVxUNyeWKU8ormaUfJBjoNVoDlwXekUPnJenfmfZqXxUInvBCfUyp7Pq+kurBORmg4yc6qOlRYuK67Xw+i5xpjbZouNlXPk0rq7pPy5zjhmZQ3kImoFPvNMeKViDcI6kSIJKtjdhms9/g/6MgXS9HlL5kFy8tYKbsyiHnHB1BsvaLAKXctbUZFDPstgMPADfnad2kZXPrNqIhfWKZrGRWidawCYJ1sKKwYxLMKrtA0umqgMoL90MmBOELhuGmvMV0cFJB+zo+K2YWjEiMGd8xRb5mC5aAy0ZcCehO46jGtpr217EJmMF8Ywr7cFqM2Shg5U2jev9qUpYiXwmPnJKDuoT2ZHuHmPgFIkYiWC5yeJnnmG5bed1sKBp93AFrJX+1Rx5oC4BpNegewmBZKpOSwls/D1uMAeQK3dPmQHLsT6o2VBLfeDGr+zY0R85ywwPZCv00vGol02zYoTqN7eFqr6Qhjr/qx5K1nnxJdFK3Ts="
@@ -32,12 +33,12 @@ cache:
3233
before_install:
3334
- echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"
3435
# Download the binary to bin folder in $GOPATH
35-
- curl -L -s https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -o $GOPATH/bin/dep
36+
- if [[ "${TRAVIS_GO_VERSION}" == 1.10* ]]; then curl -L -s https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -o $GOPATH/bin/dep; fi
3637
# Make the binary executable
37-
- chmod +x $GOPATH/bin/dep
38+
- if [[ "${TRAVIS_GO_VERSION}" == 1.10* ]]; then chmod +x $GOPATH/bin/dep; fi
3839

3940
install:
40-
- dep ensure -vendor-only
41+
- if [[ "${TRAVIS_GO_VERSION}" == 1.10* ]]; then dep ensure -vendor-only; fi
4142
- go get github.com/mattn/goveralls
4243

4344
script:

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ COPY cli ./cli
1515
COPY database ./database
1616
COPY source ./source
1717

18+
ENV GO111MODULE=on
1819
ENV DATABASES="postgres mysql redshift cassandra spanner cockroachdb clickhouse"
1920
ENV SOURCES="file go_bindata github aws_s3 google_cloud_storage"
2021

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ __[Go Documentation](https://godoc.org/github.com/golang-migrate/migrate)__
107107

108108
```go
109109
import (
110-
"github.com/golang-migrate/migrate"
111-
_ "github.com/golang-migrate/migrate/database/postgres"
112-
_ "github.com/golang-migrate/migrate/source/github"
110+
"github.com/golang-migrate/migrate/v3"
111+
_ "github.com/golang-migrate/migrate/v3/database/postgres"
112+
_ "github.com/golang-migrate/migrate/v3/source/github"
113113
)
114114

115115
func main() {
@@ -126,9 +126,9 @@ Want to use an existing database client?
126126
import (
127127
"database/sql"
128128
_ "github.com/lib/pq"
129-
"github.com/golang-migrate/migrate"
130-
"github.com/golang-migrate/migrate/database/postgres"
131-
_ "github.com/golang-migrate/migrate/source/file"
129+
"github.com/golang-migrate/migrate/v3"
130+
"github.com/golang-migrate/migrate/v3/database/postgres"
131+
_ "github.com/golang-migrate/migrate/v3/source/file"
132132
)
133133

134134
func main() {

cli/build_aws-s3.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
package main
44

55
import (
6-
_ "github.com/golang-migrate/migrate/source/aws_s3"
6+
_ "github.com/golang-migrate/migrate/v3/source/aws_s3"
77
)

cli/build_cassandra.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
package main
44

55
import (
6-
_ "github.com/golang-migrate/migrate/database/cassandra"
6+
_ "github.com/golang-migrate/migrate/v3/database/cassandra"
77
)

cli/build_clickhouse.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
package main
44

55
import (
6-
_ "github.com/golang-migrate/migrate/database/clickhouse"
6+
_ "github.com/golang-migrate/migrate/v3/database/clickhouse"
77
_ "github.com/kshvakov/clickhouse"
88
)

cli/build_cockroachdb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
package main
44

55
import (
6-
_ "github.com/golang-migrate/migrate/database/cockroachdb"
6+
_ "github.com/golang-migrate/migrate/v3/database/cockroachdb"
77
)

cli/build_github.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
package main
44

55
import (
6-
_ "github.com/golang-migrate/migrate/source/github"
6+
_ "github.com/golang-migrate/migrate/v3/source/github"
77
)

cli/build_go-bindata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
package main
44

55
import (
6-
_ "github.com/golang-migrate/migrate/source/go_bindata"
6+
_ "github.com/golang-migrate/migrate/v3/source/go_bindata"
77
)

cli/build_godoc-vfs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
package main
44

55
import (
6-
_ "github.com/golang-migrate/migrate/source/godoc_vfs"
6+
_ "github.com/golang-migrate/migrate/v3/source/godoc_vfs"
77
)

0 commit comments

Comments
 (0)