Ensure proper comparison order in "abi-check" jobs

Right before the release API version (LIBINTERFACE, LIBREVISION, LIBAGE)
for older and newer libraries tends to be the same. Given that, commit
hash can't be the determining factor here, Unix time of the commit
should suit us better and is placed after the API version. The commit
hash is preserved as it's useful to see it in the actual report.

(cherry picked from commit 313518dd3d24b580d89fc5d78eaec634be875494)

diff --git a/util/api-checker.sh b/util/api-checker.sh
index a424234ecaf1be454304ce2403455d0da25c5e49..bc0c6cd0b84387119a5cc179d26ad94755eb8691 100755 (executable)
--- a/util/api-checker.sh
+++ b/util/api-checker.sh
@@ -49,12 +49,12 @@ check_program w3m
 # generate ABI dump file for them.
 while read -r SO; do
        APIFILE="$(dirname "${SO}")/../api"
-       pushd "$(dirname "${APIFILE}")"
-       GIT_REVISION=$(git rev-parse HEAD | cut -c 1-10)
-       popd
+       APIFILE_DIR=$(dirname "${APIFILE}")
+       GIT_HEAD_REV=$(git -C "${APIFILE_DIR}" rev-parse HEAD | cut -c 1-10)
+       GIT_HEAD_UNIX_TIME=$(git -C "${APIFILE_DIR}" log -1 --format=%ct HEAD)
        # Get LIBINTERFACE, LIBREVISION, LIBAGE from the 'api' file.
        eval "$(grep -v "^#" "${APIFILE}" | tr -d " ")"
-       VERSION="${LIBINTERFACE}.${LIBREVISION}.${LIBAGE}-${GIT_REVISION}"
+       VERSION="${LIBINTERFACE}.${LIBREVISION}.${LIBAGE}-${GIT_HEAD_UNIX_TIME}-${GIT_HEAD_REV}"
        abi-dumper "${SO}" -o abi-"$(basename "${SO}" .so)-${VERSION}".dump -lver "${VERSION}"
 done < <(find "${TESTBIND}"/lib/*/.libs/ "${REFBIND}"/lib/*/.libs/ -name '*.so')