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

Include git commit in version #1347

Merged
merged 5 commits into from
Dec 8, 2023

Conversation

timvaillancourt
Copy link
Collaborator

A Pull Request should be associated with an Issue.

Related issue: #1346

Description

This PR adds the git commit hash to the version info gh-ost returns using the --version flag and in the logs at startup time

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.

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>
@timvaillancourt timvaillancourt added this to the v1.1.7 milestone Dec 7, 2023
@timvaillancourt timvaillancourt marked this pull request as ready for review December 7, 2023 14:35
meiji163
meiji163 previously approved these changes Dec 7, 2023
@timvaillancourt
Copy link
Collaborator Author

@meiji163 thanks for the review. I made one small change to make the --version output change less-breaking in case someone is parsing that output in script, etc

@timvaillancourt timvaillancourt linked an issue Dec 7, 2023 that may be closed by this pull request
@timvaillancourt timvaillancourt merged commit d90112c into github:master Dec 8, 2023
7 checks passed
@timvaillancourt timvaillancourt deleted the version-add-commit branch December 8, 2023 22:03
@timvaillancourt timvaillancourt mentioned this pull request Dec 11, 2023
2 tasks
RainbowDashy pushed a commit to bytebase/gh-ost that referenced this pull request Jan 2, 2024
* Include git commit in version

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

* Make --version output change less-breaking

---------

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>
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 <tim@timvaillancourt.com>

* Remove stale RELEASE_VERSION file (github#1349)

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

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

* WIP

* Pass entire sql.UniqueKey

* newline for limit

* Rename var

---------

Co-authored-by: meiji163 <meiji163@github.com>

* Include git commit in version (github#1347)

* Include git commit in version

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

* Make --version output change less-breaking

---------

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

* 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 <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

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

* Fix `--version` output

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

* Always fallback version/commit if undef

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

---------

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

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

* go1.21 + bullseye

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* go1.21 + bullseye pt 2

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* checkout before setup-go

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* go fmt

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Use golangci-lint 1.54.2 to support go1.21

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* stop using io/ioutil to make linter happy

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Fix typo

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Lint

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

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

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Update ensure-go-installed

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

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* stretch -> bullseye

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>

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

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

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

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* go mod tidy

* update test

* fix lint

---------

Signed-off-by: Tim Vaillancourt <tvaillancourt@slack-corp.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Co-authored-by: Rashiq <rashiq@users.noreply.github.com>
Co-authored-by: meiji163 <meiji163@github.com>
Co-authored-by: guangwu <guoguangwu@magic-shield.com>
Co-authored-by: Tim Vaillancourt <tim@timvaillancourt.com>
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.

Add git commit hash to version info
2 participants