Update to go1.15.7, removed chapsuk/golang docker image usage (#15)

chapsuk · Feb 6, 2021 · 2850494 · 2850494
1 parent 02bd01e
commit 2850494
Show file tree

Hide file tree

Showing 323 changed files with 48,440 additions and 89,408 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,15 @@
 language: go
 
 go:
-  - 1.12.x
+  - 1.15.x
 
 env:
   global: 
     - GO111MODULE=on
 
 services:
   - mysql
-  - postgres
+  - postgresql
 
 before_install:
   - mysql -e "CREATE DATABASE miga;"

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM chapsuk/golang:1.12.3
+FROM golang:1.15.7-alpine3.13
+RUN apk add make
 ADD . /go/src/miga
 WORKDIR /go/src/miga
 RUN make build

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = miga
-VERSION ?= v0.7.2
+VERSION ?= v0.7.3
 PG_CONTAINER_NAME = miga-pg
 MYSQL_CONTAINER_NAME = miga-mysql
 IMAGE_NAME = chapsuk/$(NAME)

diff --git a/config/config_test.go b/config/config_test.go
@@ -137,6 +137,7 @@ var pgCredentialsTable = []testCase{
 			Options:  "",
 		},
 		invalidDSN: true,
+		shouldErr:  true,
 		dsn:        "postgres://foo:bar/@127.0.0.1:11132/test?",
 	},
 }
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module miga
 
-go 1.12
+go 1.15
 
 require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
@@ -10,11 +10,11 @@ require (
 	github.com/im-kulikov/migrate v0.1.0
 	github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect
 	github.com/lib/pq v1.0.0
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/onsi/gomega v1.5.0 // indirect
+	github.com/onsi/ginkgo v1.15.0 // indirect
+	github.com/onsi/gomega v1.10.5 // indirect
 	github.com/pkg/errors v0.8.1
 	github.com/pressly/goose v2.6.0+incompatible
-	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a
+	github.com/smartystreets/goconvey v1.6.4
 	github.com/spf13/viper v1.3.2
 	go.uber.org/atomic v1.3.2 // indirect
 	go.uber.org/multierr v1.1.0 // indirect

diff --git a/go.sum b/go.sum
diff --git a/tests/config_test.go b/tests/config_test.go
@@ -73,16 +73,6 @@ func TestConfig(t *testing.T) {
 					err = os.RemoveAll(dir)
 					So(err, ShouldBeNil)
 				})
-
-				Convey("Miga should fail up cmd with empty DSN", func() {
-					ctx := cli.NewContext(nil, &flag.FlagSet{}, nil)
-
-					err = commands.Up(ctx, d)
-					So(err, ShouldNotBeNil)
-
-					err = commands.Up(ctx, s)
-					So(err, ShouldNotBeNil)
-				})
 			})
 		}
 

diff --git a/vendor/github.com/fsnotify/fsnotify/.editorconfig b/vendor/github.com/fsnotify/fsnotify/.editorconfig
diff --git a/vendor/github.com/fsnotify/fsnotify/.gitattributes b/vendor/github.com/fsnotify/fsnotify/.gitattributes
diff --git a/vendor/github.com/fsnotify/fsnotify/.travis.yml b/vendor/github.com/fsnotify/fsnotify/.travis.yml
diff --git a/vendor/github.com/fsnotify/fsnotify/LICENSE b/vendor/github.com/fsnotify/fsnotify/LICENSE
diff --git a/vendor/github.com/fsnotify/fsnotify/README.md b/vendor/github.com/fsnotify/fsnotify/README.md
diff --git a/vendor/github.com/fsnotify/fsnotify/fsnotify.go b/vendor/github.com/fsnotify/fsnotify/fsnotify.go
diff --git a/vendor/github.com/fsnotify/fsnotify/go.mod b/vendor/github.com/fsnotify/fsnotify/go.mod
diff --git a/vendor/github.com/fsnotify/fsnotify/go.sum b/vendor/github.com/fsnotify/fsnotify/go.sum
diff --git a/vendor/github.com/fsnotify/fsnotify/inotify_poller.go b/vendor/github.com/fsnotify/fsnotify/inotify_poller.go
diff --git a/vendor/github.com/fsnotify/fsnotify/open_mode_bsd.go b/vendor/github.com/fsnotify/fsnotify/open_mode_bsd.go
diff --git a/vendor/github.com/fsnotify/fsnotify/open_mode_darwin.go b/vendor/github.com/fsnotify/fsnotify/open_mode_darwin.go
diff --git a/vendor/github.com/lib/pq/oid/gen.go b/vendor/github.com/lib/pq/oid/gen.go