mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-06-20 14:33:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: guard git version detection against missing .git directory
Some checks failed
Continuous integration build / compile (clang, alpine:edge, disabled) (push) Has been cancelled
Details
Continuous integration build / compile (clang, alpine:edge, enabled) (push) Has been cancelled
Details
Continuous integration build / compile (clang, archlinux:base-devel, disabled) (push) Has been cancelled
Details
Continuous integration build / compile (clang, archlinux:base-devel, enabled) (push) Has been cancelled
Details
Continuous integration build / compile (gcc, alpine:edge, disabled) (push) Has been cancelled
Details
Continuous integration build / compile (gcc, alpine:edge, enabled) (push) Has been cancelled
Details
Continuous integration build / compile (gcc, archlinux:base-devel, disabled) (push) Has been cancelled
Details
Continuous integration build / compile (gcc, archlinux:base-devel, enabled) (push) Has been cancelled
Details
Continuous integration build / format (push) Has been cancelled
Details
Continuous integration build / scan-build (push) Has been cancelled
Details

Browse source 
When building from a release tarball, there is no .git directory
and git rev-parse would either fail or pick up a parent repository's
HEAD. Guard the git version detection with fs.is_dir('.git') so
that tarball builds produce a clean version string.

Requires importing the fs module.

Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
This commit is contained in:
Rudi Heitbaum 2026-06-02 22:42:58 +00:00 • committed by Simon Ser
parent 1f9f0d2581
commit e5db9506b4
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
meson.build
View file

@ -18,6 +18,8 @@ add_project_arguments(
language: 'c',
)
fs = import('fs')
if get_option('buildtype').startswith('debug')
add_project_arguments('-DDEBUG', language : 'c')
endif
@ -43,16 +45,18 @@ math = cc.find_library('m')
have_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
version = '@0@'.format(meson.project_version())
git = find_program('git', native: true, required: false)
if git.found()
git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)
git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
if git_commit.returncode() == 0 and git_branch.returncode() == 0
version = '@0@-@1@ (branch \'@2@\')'.format(
meson.project_version(),
git_commit.stdout().strip(),
git_branch.stdout().strip(),
)
if fs.is_dir('.git')
git = find_program('git', native: true, required: false)
if git.found()
git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)
git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
if git_commit.returncode() == 0 and git_branch.returncode() == 0
version = '@0@-@1@ (branch \'@2@\')'.format(
meson.project_version(),
git_commit.stdout().strip(),
git_branch.stdout().strip(),
)
endif
endif
endif