Skip to content

Commit 730c382

Browse files
committed
Correctly extract ORIOLEDB_PATCHSET_VERSION from git
* Use patchset number is there is an exact match to the tag * Use commit hash otherwise
1 parent 5f9e2af commit 730c382

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19559,7 +19559,7 @@ _ACEOF
1955919559

1956019560

1956119561
# Needed to check postgresql patches git tag during orioledb extension build
19562-
ORIOLEDB_PATCHSET_VERSION=`git describe --tags | cut -d'_' -f2`
19562+
ORIOLEDB_PATCHSET_VERSION=`tag=$(git describe --tags --exact-match 2>/dev/null) && echo "$tag" | cut -d'_' -f2 || git rev-parse HEAD`
1956319563

1956419564

1956519565
# If we are inserting PG_SYSROOT into CPPFLAGS, do so symbolically not

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2426,7 +2426,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a num
24262426
AC_SUBST(PG_VERSION_NUM)
24272427

24282428
# Needed to check postgresql patches git tag during orioledb extension build
2429-
[ORIOLEDB_PATCHSET_VERSION=`git describe --tags | cut -d'_' -f2`]
2429+
[ORIOLEDB_PATCHSET_VERSION=`tag=$(git describe --tags --exact-match 2>/dev/null) && echo "$tag" | cut -d'_' -f2 || git rev-parse HEAD`]
24302430
AC_SUBST(ORIOLEDB_PATCHSET_VERSION)
24312431

24322432
# If we are inserting PG_SYSROOT into CPPFLAGS, do so symbolically not

0 commit comments

Comments
 (0)