From d087e8c4a9b521c6ed1659e5e3e65c2f6ebbe8ca Mon Sep 17 00:00:00 2001 From: Mike Fridman Date: Thu, 29 Jun 2023 11:51:00 -0400 Subject: [PATCH 1/3] Add changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..a42682e56 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +# Changelog + +## [Unreleased] + +- Fix `up` and `up -allowing-missing` behavior +- Fix empty version in log output +- Add new `context.Context`-aware functions and methods + +[Unreleased]: https://github.com/bufbuild/buf/compare/v3.11.2...HEAD From 249963c7f8a0457a85df9a240452996be60a885f Mon Sep 17 00:00:00 2001 From: Mike Fridman Date: Thu, 29 Jun 2023 11:51:33 -0400 Subject: [PATCH 2/3] Update Makefile and print version --- Makefile | 8 ++++---- cmd/goose/main.go | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a41d259a0..eda49a8c4 100644 --- a/Makefile +++ b/Makefile @@ -44,9 +44,9 @@ docker-cleanup: docker-start-postgres: docker run --rm -d \ - -e POSTGRES_USER=${GOOSE_POSTGRES_DB_USER} \ - -e POSTGRES_PASSWORD=${GOOSE_POSTGRES_PASSWORD} \ - -e POSTGRES_DB=${GOOSE_POSTGRES_DBNAME} \ - -p ${GOOSE_POSTGRES_PORT}:5432 \ + -e POSTGRES_USER=${POSTGRES_DB_USER} \ + -e POSTGRES_PASSWORD=${POSTGRES_PASSWORD} \ + -e POSTGRES_DB=${POSTGRES_DBNAME} \ + -p ${POSTGRES_PORT}:5432 \ -l goose_test \ postgres:14-alpine -c log_statement=all diff --git a/cmd/goose/main.go b/cmd/goose/main.go index 913e07cfb..2cf4c0a81 100644 --- a/cmd/goose/main.go +++ b/cmd/goose/main.go @@ -37,7 +37,7 @@ var ( noColor = flags.Bool("no-color", false, "disable color output (NO_COLOR env variable supported)") ) var ( - gooseVersion = "" + gooseVersion = "v3.12.0-dev" ) func main() { @@ -48,10 +48,11 @@ func main() { } if *version { - if buildInfo, ok := debug.ReadBuildInfo(); ok && buildInfo != nil && gooseVersion == "" { + buildInfo, ok := debug.ReadBuildInfo() + if ok && buildInfo != nil && buildInfo.Main.Version != "(devel)" { gooseVersion = buildInfo.Main.Version } - fmt.Printf("goose version:%s\n", gooseVersion) + fmt.Printf("goose version: %s\n", gooseVersion) return } if *verbose { From a8e5c9e50f8a80bcf466443db1c97d63ac58b209 Mon Sep 17 00:00:00 2001 From: Mike Fridman Date: Thu, 29 Jun 2023 11:59:50 -0400 Subject: [PATCH 3/3] repo name --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a42682e56..ea9e4be97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,4 +6,4 @@ - Fix empty version in log output - Add new `context.Context`-aware functions and methods -[Unreleased]: https://github.com/bufbuild/buf/compare/v3.11.2...HEAD +[Unreleased]: https://github.com/pressly/goose/compare/v3.11.2...HEAD