Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix --version output #1352

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Conversation

timvaillancourt
Copy link
Collaborator

@timvaillancourt timvaillancourt commented Dec 11, 2023

Description

This PR fixes a problem introduced in #1347 due to my forgetting to add newline character to fmt.Printf(...) 🤦

Secondly, I've made an empty GitCommit display a bit more clearer

Before (notice no \n char)

tvaillancourt@tvailla-ltmxctu gh-ost % ./gh-ost --version
unversioned (git commit: )%  

After: undefined AppVersion+GitCommit

tvaillancourt@tvailla-ltmxctu gh-ost % ./gh-ost --version                        
unversioned (git commit: unknown)
tvaillancourt@tvailla-ltmxctu gh-ost %

After

tvaillancourt@tvailla-ltmxctu gh-ost % go build -o gh-ost -ldflags "-X main.AppVersion=1.1.6 -X main.GitCommit=$(git rev-parse HEAD)" ./go/cmd/gh-ost/main.go
tvaillancourt@tvailla-ltmxctu gh-ost % ./gh-ost --version                                                                                                    
1.1.6 (git commit: 5ebb95347e2002a5a959483f3e801cd3267e7e88)
tvaillancourt@tvailla-ltmxctu gh-ost %

In case this PR introduced Go code changes:

  • contributed code is using same conventions as original code
  • script/cibuild returns with no formatting errors, build errors or unit test errors.

@@ -160,12 +160,15 @@ func main() {
flag.PrintDefaults()
return
}

Copy link
Collaborator Author

@timvaillancourt timvaillancourt Dec 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's always fallback to unversioned/unknown so that the starting gh-ost %+v logline later also gets this fallback instead of ""

@timvaillancourt timvaillancourt marked this pull request as ready for review December 11, 2023 16:08
@timvaillancourt timvaillancourt added this to the v1.1.7 milestone Dec 11, 2023
@timvaillancourt timvaillancourt merged commit 679d39e into github:master Dec 11, 2023
7 checks passed
@timvaillancourt timvaillancourt deleted the fix-version-output branch December 11, 2023 16:29
RainbowDashy pushed a commit to bytebase/gh-ost that referenced this pull request Jan 2, 2024
* Fix `--version` output

Signed-off-by: Tim Vaillancourt <[email protected]>

* Always fallback version/commit if undef

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Tim Vaillancourt <[email protected]>
d-bytebase pushed a commit to bytebase/gh-ost that referenced this pull request Jan 2, 2024
* Add `focal` build

* upgrade codeQL action to v2

* Pin docker image to stretch (github#1324)

* pin stretch image

* update stretch repo

* Update Dockerfile.test

* parse binlog timestamp in UTC (github#1322)

* upgrade standard library deps (github#1332)

* fix: typo (github#1331)

Co-authored-by: Tim Vaillancourt <[email protected]>

* Remove stale RELEASE_VERSION file (github#1349)

Signed-off-by: Tim Vaillancourt <[email protected]>

* Force index in unique key range queries (github#1237)

* WIP

* Pass entire sql.UniqueKey

* newline for limit

* Rename var

---------

Co-authored-by: meiji163 <[email protected]>

* Include git commit in version (github#1347)

* Include git commit in version

Signed-off-by: Tim Vaillancourt <[email protected]>

* Make --version output change less-breaking

---------

Signed-off-by: Tim Vaillancourt <[email protected]>

* Fix tokens in inspector logging (github#1226)

* Cleanup whitespace and comments in SQL query text (github#1246)

* Cleanup whitespace in SQL query text

* cleanup

* Add indent

* Update unit tests

* Update unit tests, pt 2

* Fix tweaks

* Fix merge conflict resolution

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Tim Vaillancourt <[email protected]>

* Fix `--version` output (github#1352)

* Fix `--version` output

Signed-off-by: Tim Vaillancourt <[email protected]>

* Always fallback version/commit if undef

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Tim Vaillancourt <[email protected]>

* Update to `go1.21` (github#1351)

* go1.21 + bullseye

Signed-off-by: Tim Vaillancourt <[email protected]>

* go1.21 + bullseye pt 2

Signed-off-by: Tim Vaillancourt <[email protected]>

* checkout before setup-go

Signed-off-by: Tim Vaillancourt <[email protected]>

* go fmt

Signed-off-by: Tim Vaillancourt <[email protected]>

* Use golangci-lint 1.54.2 to support go1.21

Signed-off-by: Tim Vaillancourt <[email protected]>

* stop using io/ioutil to make linter happy

Signed-off-by: Tim Vaillancourt <[email protected]>

* Fix typo

Signed-off-by: Tim Vaillancourt <[email protected]>

* Lint

Signed-off-by: Tim Vaillancourt <[email protected]>

* revert replica-tests CI to ubuntu 20 due to linker errors

Signed-off-by: Tim Vaillancourt <[email protected]>

* Update ensure-go-installed

* use `ubuntu-latest` for `ci` job

Signed-off-by: Tim Vaillancourt <[email protected]>

* stretch -> bullseye

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Tim Vaillancourt <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>

* Replace deprecated `github.com/satori/go.uuid` lib (github#1354)

Signed-off-by: Tim Vaillancourt <[email protected]>

* Add `CODEOWNERS` file to auto-request reviews (github#1350)

Signed-off-by: Tim Vaillancourt <[email protected]>

* go mod tidy

* update test

* fix lint

---------

Signed-off-by: Tim Vaillancourt <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Rashiq <[email protected]>
Co-authored-by: meiji163 <[email protected]>
Co-authored-by: guangwu <[email protected]>
Co-authored-by: Tim Vaillancourt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants