Add FSRS version to BuildConfig #427
Conversation
|
I'm just wrestling a bit with Gradle right now. Seems like JavaExec has different behavior for double quotes on different platforms.. |
david-allison
dismissed
their stale review
This is why I didn't review first thing in the morning. CI failure
|
I'll see if I can avoid cargo downloading a bunch of crates to parse the version.. Otherwise, we will just use the "non-clean" route of grabbing it directly from Cargo.toml. |
voczi
force-pushed
the
main
branch
2 times, most recently
from
cdb1b77
to
9b3b4d3
Compare
|
Never mind. I don't think some extra crates being downloaded matters that much.. |
Cargo.lock
Outdated
| @@ -1485,9 +1485,9 @@ dependencies = [ | |||
|
|
|||
| [[package]] | |||
| name = "fsrs" | |||
| version = "1.2.2" | |||
| version = "1.3.1" | |||
There was a problem hiding this comment.
why, on main, is Cargo.lock set with fsrs of 1.2.2 ? That pin should have moved with the 24.10beta2+ and beta3 submodule sha updates? 🤔
Either way I need lock updates in separate commits because we have a release-2.19 branch here for me to release stable backend versions (that do not contain 24.10betas...) paired with the Anki-Android repo 2.19 release coming up
There was a problem hiding this comment.
Okay, peeled this to #428 - it was my mistake originally, and you weren't wrong to have it in your local main but it was a whole process failure on my part. That PR should fix it, I'm purging it from this PR
mikehardy
added
the
pending-merge
|
Pending CI, I expect to see an FSRS version 1.2.1 in there indicating this is running well |
|
post-merge: optional: ...or could wait until next anki beta with FSRS v3/v4 cross-compat updates upstream |
There was a problem hiding this comment.
LGTM, thanks so much!
@mikehardy leaving this one to you, as there are follow-up tasks
| @@ -26,7 +26,7 @@ def getAnkiCommitHash = { -> | |||
| def getFsrsVersion = { -> | |||
| def pkgStdout = new ByteArrayOutputStream() | |||
| exec { | |||
| commandLine "cargo", "metadata", "--format-version=1", "--manifest-path=" + new File("${project.rootDir}", "anki/Cargo.toml") | |||
| commandLine "cargo", "metadata", "--locked", "--format-version=1", "--manifest-path=" + new File("${project.rootDir}", "anki/Cargo.toml") | |||
There was a problem hiding this comment.
neat trick, wasn't aware of this one
mikehardy
removed
the
pending-merge
|
I have bumped local version to 0.1.43 on main and release-2.19 branches and triggered releases for both, for use in Anki-Android |
Excerpt from the Discord (slightly edited):
"
"i just used the FSRS crate version. actually pulling the version from the JS file (in the "normal" format, i.e. "FSRS 5.x.x") would require us to checkout the fsrs4anki repo with the branch==fsrs crate version, then pull the version from the js file with some regex.. very messy.
using the fsrs crate version would be that we can track any change to the FSRS crate, not just to the algorithm.
pulling the hash of the fsrs git commit can also be done, but is messy because anki is fed the fsrs dep through crates.io and not through github. so, best avoided.
Related issue: ankidroid/Anki-Android#17236