Skip to content

Show git commit hash in gala --version #2815

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

Open
lenemter wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −2
Open

Show git commit hash in gala --version #2815

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc7246a
Show git commit hash in `gala --version`
lenemter Apr 11, 2026
5477eaa
Merge branch 'main' into lenemter/show-git-hash-in-ver
zeebok Apr 25, 2026
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
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
env:
DESTDIR: out
run: |
git config --global --add safe.directory "$(pwd)"
Copy link
Copy Markdown
Member

@ryonakano ryonakano Apr 12, 2026

Choose a reason for hiding this comment

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

Suggested change
git config --global --add safe.directory "$(pwd)"
git config --global --add safe.directory "$GITHUB_WORKSPACE"

It seems like we use this environment variable in other places. Also this is (slightly) more efficient than a command substitution.

meson build -Ddocumentation=true -Dtests=true
ninja -C build
ninja -C build install
Expand Down Expand Up @@ -78,6 +79,7 @@ jobs:
env:
DESTDIR: out
run: |
git config --global --add safe.directory "$(pwd)"
Copy link
Copy Markdown
Member

@ryonakano ryonakano Apr 12, 2026

Choose a reason for hiding this comment

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

Suggested change
git config --global --add safe.directory "$(pwd)"
git config --global --add safe.directory "$GITHUB_WORKSPACE"

Same here.

meson build
ninja -C build install

Expand Down
3 changes: 2 additions & 1 deletion config.vala.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* SPDX-License-Identifier: GPL-3.0-or-later
* SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
* SPDX-FileCopyrightText: 2025-2026 elementary, Inc. (https://elementary.io)
* 2011 Robert Dyer
* 2011 Rico Tzschichholz
*/
Expand All @@ -10,4 +10,5 @@ namespace Config {
public const string LOCALEDIR = "@LOCALEDIR@";
public const string VERSION = "@VERSION@";
public const string PLUGINDIR = "@PLUGINDIR@";
public const string GIT_HASH = "@GIT_HASH@";
}
8 changes: 8 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ conf.set('GETTEXT_PACKAGE', meson.project_name())
conf.set('LOCALEDIR', locale_dir)
conf.set('PLUGINDIR', plugins_dir)
conf.set('VERSION', meson.project_version())

git = find_program('git', required: false)
git_hash = 'unknown'
if git.found()
git_hash = run_command(['git', 'rev-parse', '--short', 'HEAD'], capture : true, check : true).stdout().strip()
endif
conf.set('GIT_HASH', git_hash)

config_header = configure_file (
input: 'config.vala.in',
output: 'config.vala',
Expand Down
3 changes: 2 additions & 1 deletion src/Main.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//
// Copyright (C) 2012 Tom Beckmann, Rico Tzschichholz
// Copyright (C) 2026 elementary, Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
Expand All @@ -22,7 +23,7 @@ namespace Gala {
};

private void print_version () {
stdout.printf ("Gala %s\n", Config.VERSION);
stdout.printf ("Gala %s (%s)\n", Config.VERSION, Config.GIT_HASH);
Meta.exit (Meta.ExitCode.SUCCESS);
}

Expand Down