Closed SoapGentoo closed 5 years ago
Hi!
Thank you for the PR! I will merge it next week. I agree with the idea. The 'pre' release was meant for the internal test mostly, hence the failed git version test was ignored. I guess you make a nightly package, is that right? I will keep that in mind then for future releases.
pt., 26.04.2019, 12:59 użytkownik David Seifert notifications@github.com napisał:
Hi @szszszsz https://github.com/szszszsz The version test is very sensitive to the actual string, and causes failures in the git, but also versioned release ebuilds in Gentoo. I fixed it for building from git, but also when using from a git archive tarball.
In general I would suggest using more decoupled versioning, i.e., create the Main version string from MAJOR.MINOR.PATCH, and append the (possibly dirty) commit id to that, as an optional suffix. That is more robust and requires less dependence on the output of git describe.
You can view, comment on, or merge this pull request online at:
https://github.com/Nitrokey/libnitrokey/pull/157 Commit Summary
- Fix regex in unittest for pre-releases and git checkouts
File Changes
- M CMakeLists.txt https://github.com/Nitrokey/libnitrokey/pull/157/files#diff-0 (2)
- M unittest/test_offline.cc https://github.com/Nitrokey/libnitrokey/pull/157/files#diff-1 (4)
Patch Links:
- https://github.com/Nitrokey/libnitrokey/pull/157.patch
- https://github.com/Nitrokey/libnitrokey/pull/157.diff
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Nitrokey/libnitrokey/pull/157, or mute the thread https://github.com/notifications/unsubscribe-auth/AEBXW4VWNZPQNKTGBCXGSPTPSLN75ANCNFSM4HIUUNFA .
@szszszsz ping
Sorry for delay. Merged!
Hi @szszszsz The version test is very sensitive to the actual string, and causes failures in the git, but also versioned release ebuilds in Gentoo. I fixed it for building from
git
, but also when using from a git archive tarball.In general I would suggest using more decoupled versioning, i.e., create the Main version string from MAJOR.MINOR.PATCH, and append the (possibly dirty) commit id to that, as an optional suffix. That is more robust and requires less dependence on the output of
git describe
. For instance, this is how Autoconf and the gnulib git module do it, and the version string is more stable and less wonky.