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.

Sign up for GitHub

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

Jump to bottom

Include git commit in version #1347

Merged
merged 5 commits into from
Dec 8, 2023
Merged

Include git commit in version #1347

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a44138
Include git commit in version
timvaillancourt Dec 7, 2023
c93ffd6
Merge branch 'master' into version-add-commit
timvaillancourt Dec 7, 2023
e7da9ce
Make --version output change less-breaking
timvaillancourt Dec 7, 2023
07b198b
Merge branch 'master' into version-add-commit
timvaillancourt Dec 7, 2023
12d6ccd
Merge branch 'master' into version-add-commit
timvaillancourt Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,14 @@ main() {
RELEASE_VERSION=$(cat RELEASE_VERSION)
fi

if [ -z "${GIT_COMMIT}" ]; then
GIT_COMMIT=$(git rev-parse HEAD)
fi

buildpath=/tmp/gh-ost-release
target=gh-ost
timestamp=$(date "+%Y%m%d%H%M%S")
ldflags="-X main.AppVersion=${RELEASE_VERSION}"
ldflags="-X main.AppVersion=${RELEASE_VERSION} -X main.GitCommit=${GIT_COMMIT}"

mkdir -p ${buildpath}
rm -rf ${buildpath:?}/*
Expand Down
6 changes: 3 additions & 3 deletions go/cmd/gh-ost/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"golang.org/x/term"
)

var AppVersion string
var AppVersion, GitCommit string

// acceptSignals registers for OS signals
func acceptSignals(migrationContext *base.MigrationContext) {
Expand Down Expand Up @@ -165,7 +165,7 @@ func main() {
if appVersion == "" {
appVersion = "unversioned"
}
fmt.Println(appVersion)
fmt.Printf("gh-ost version: %s, git commit: %s", appVersion, GitCommit)
return
}

Expand Down Expand Up @@ -308,7 +308,7 @@ func main() {
migrationContext.Log.Errore(err)
}

log.Infof("starting gh-ost %+v", AppVersion)
log.Infof("starting gh-ost %+v (git commit: %s)", AppVersion, GitCommit)
acceptSignals(migrationContext)

migrator := logic.NewMigrator(migrationContext, AppVersion)
Expand Down
Loading