Summary: | Release dates are missing from the timeline | ||
---|---|---|---|
Product: | Koha | Reporter: | Katrin Fischer <katrin.fischer> |
Component: | Documentation | Assignee: | Martin Renvoize (ashimema) <martin.renvoize> |
Status: | RESOLVED DUPLICATE | QA Contact: | Testopia <testopia> |
Severity: | minor | ||
Priority: | P5 - low | CC: | jonathan.druart, magnus, martin.renvoize |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
GIT URL: | Change sponsored?: | --- | |
Patch complexity: | --- | Documentation contact: | |
Documentation submission: | Text to go in the release notes: | ||
Version(s) released in: | Circulation function: | ||
Attachments: |
Bug 25442: Add release dates from the timeline
Bug 25442: Use tags to update history |
Description
Katrin Fischer
2020-05-10 11:30:44 UTC
The last line on master is 1084 1589278508>-May 12 2020>Slava Shishkin becomes the 428th developer to have a patch pushed>--developer However it's missing the minor releases' dates Created attachment 105523 [details] [review] Bug 25442: Add release dates from the timeline It also fixes 326th<=>327th and 393rd<=>394th dev positions The dates are wrong, epoch must come from commit dates, and the date converted in UTC. OK.. I think we need distinct bugs.. one for correcting the epoch date vs display date issue (I've updated bin/get_developers.pl to output a nicely formatted fix for this in the release_tools and can upload a generated patch here or on a new bug) and one to add in all the missing releases.. minor releases are hard to pick out of the commit log as they're each on their own branch. I am doing that: git log --tags --simplify-by-decoration --pretty="format:%at %d"|grep 'tag: v'|sort -n Nice.. I didn't think about looking at it from the tags perspective. get_developers now uses tags for releases.. but tags aren't entirely consistent so some manual cleaning may be required.. I'll work through that and submit a patch here including both set of changes Please share the script in the release-tools repo. My code was: my $tags = `git log --tags --simplify-by-decoration --pretty="format:%at %d"|grep 'tag: v'|sort -n`; #2014-01-23 16:08:37 -0300 (tag: v3.12.09, 3.12.X) for my $tag ( split "\n", $tags ) { if ( $tag =~ m|^(?<epoch>\d+)\s+\(tag: v(?<version>\d+\.\d+\.\d+)| ) { my $version = $+{version}; my $epoch = $+{epoch}; $events->{$epoch} = { epoch => $epoch, description => "Koha $version released", tags => 'releases' }; } else { say "$tag DOES NOT MATCH"; } } Created attachment 105594 [details] [review] Bug 25442: Use tags to update history see alternative patch.. mostly from the updated get_developers with some manual interaction Is the alternative ready for testing? Yes, please take a look at the alternative.. the script used to produce it is available here: https://gitlab.com/koha-community/release-tools/-/blob/master/bin/get_developers.pl With the relevant code changes in the last two commits, the former of which just uncomments the Time::Moment handling to ensure we use epoch time of the commit for the display line in the history and the latter adds handling to catching versions via git tags. $ git bz apply 25442 Bug 25442 - Release dates are missing from the timeline 105594 - Bug 25442: Use tags to update history Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 25442: Use tags to update history Using index info to reconstruct a base tree... M docs/history.txt Falling back to patching base and 3-way merge... Auto-merging docs/history.txt CONFLICT (content): Merge conflict in docs/history.txt error: Failed to merge in the changes. Patch failed at 0001 Bug 25442: Use tags to update history Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-25442-Use-tags-to-update-history-SuS8Jj.patch The most recent entry in history.txt is now this: 1598907821 August 31 2020 Koha 20.05.03 released releases Not sure if the point of the patch here is to change the format or method of generating history.txt in some way, or just to update it? If it is the latter it seems to have been bypassed by other updates. |