Auto tarball #1983
Auto tarball #1983
Conversation
|
@Mergifyio rebase |
benjeffery
force-pushed
the
auto_tarball
branch
from
e63ac33 to
f5f6ee6
Compare
✅ Branch has been successfully rebased |
Codecov Report
@@ Coverage Diff @@
## main #1983 +/- ##
=======================================
Coverage 93.35% 93.35%
=======================================
Files 27 27
Lines 25521 25521
Branches 1111 1111
=======================================
Hits 23826 23826
Misses 1660 1660
Partials 35 35
Flags with carried forward coverage won't be shown. Click here to find out more. Continue to review full report at Codecov.
|
jeromekelleher
left a comment
jeromekelleher
left a comment
There was a problem hiding this comment.
Looks great!
Could we add a test like this one to tests/test_core.c please? See the kastore meson.build for how to define the MESON_VERSION.
benjeffery
force-pushed
the
auto_tarball
branch
from
f5f6ee6 to
07d8740
Compare
|
@jeromekelleher test added! |
|
@megifyio rebase |
|
@Mergifyio rebase |
|
(misspelled above @benjeffery ) |
benjeffery
force-pushed
the
auto_tarball
branch
from
07d8740 to
6ae9f3c
Compare
✅ Branch has been successfully rebased |
jeromekelleher
left a comment
jeromekelleher
left a comment
There was a problem hiding this comment.
LGTM @benjeffery - might be worth renaming a few things though just in case there's any confusion about which version of the version string comes first though!
c/meson.build
Outdated
| sources: ['tests/test_core.c'], | ||
| link_with: [tskit_lib, test_lib], c_args: extra_c_args, dependencies: kastore_dep) | ||
| link_with: [tskit_lib, test_lib], c_args: extra_c_args, dependencies: kastore_dep, | ||
| c_args: ['-DTSKIT_VERSION="@0@"'.format(meson.project_version())]) |
There was a problem hiding this comment.
I used MESON_VERSION in kastore as a way of indicating "this is the version that meson thinks we're at", since it's not used at all otherwise. I guess there's not much chance of confusion when we're just passing it in to test_core.c and we're documenting it like this? How about MESON_PROJECT_VERSION as being absolutely explicit here?
c/tests/test_core.c
Outdated
| } | ||
|
|
||
| static void | ||
| test_tskit_version(void) |
There was a problem hiding this comment.
We're testing the meson project version agrees with the defines (which are authoritative). Good to name the test accordingly
benjeffery
force-pushed
the
auto_tarball
branch
4 times, most recently
from
40096b9 to
de176ef
Compare
|
Yeah, those are better names, fixed. |
jeromekelleher
left a comment
jeromekelleher
left a comment
There was a problem hiding this comment.
Looks good, one missing search/replace
c/tests/test_core.c
Outdated
|
|
||
| sprintf( | ||
| version, "%d.%d.%d", TSK_VERSION_MAJOR, TSK_VERSION_MINOR, TSK_VERSION_PATCH); | ||
| /* the TSKIT_VERSION define is passed in by meson when compiling */ |
There was a problem hiding this comment.
| /* the TSKIT_VERSION define is passed in by meson when compiling */ | |
| /* the MESON_PROJECT_VERSION define is passed in by meson when compiling */ |
benjeffery
force-pushed
the
auto_tarball
branch
from
de176ef to
1835313
Compare
benjeffery
force-pushed
the
auto_tarball
branch
from
1835313 to
2a8f05b
Compare
benjeffery
force-pushed
the
auto_tarball
branch
from
2a8f05b to
8e66a8c
Compare
2 participants
Fixes #1960
Example release and tarball at https://github.com/benjeffery/tskit/releases/tag/untagged-0e09d39c7639d7004348