Closed BanjoFox closed 5 years ago
Conflict | Notes |
---|---|
Cargo.lock | Should this be added to .gitignore? |
Cargo.toml | Needs review |
aardwolf-models/Cargo.toml | Needs review |
src/aardwolf/lib.rs | Removed from Master (PR #156) |
src/aardwolf/routes/auth.rs | Removed from Master (PR #156) |
src/bin/main.rs | Removed from Master (PR #156) |
Cargo.lock shouldn't be in the .gitignore, or you'll lose reproducible builds. Once you'll have fixed the conflicts in Cargo.toml
s, run rm Cargo.lock && cargo update
to magically fix the conflicts.
@BaptisteGelez -- That is an interesting point.
Short Version: I am okay with leaving it out, and doing the 'rm' before any merge (my usual solution).
Long Version: Although I am wondering how much real value there is in that. Every time I have cleared/rebuilt without changing the TOML file, the LOCK file has been identical.
My -current- understanding is that the Cargo.lock is built as part of it's Toml pair. So in -theory- it should be possible to create re-producable builds based on the Toml file alone.
Is that an incorrect interpretation?
if you don't have a lockfile, cargo has the potential to pull newer packages than what you were previously using. It might not do that if we're up to date on everything, or it may have some logic to use cached packages on your system instead of pulling new ones. I'm not sure. but the lockfile is what states exactly
what is in your app and how to get to that state again
Aha!
Thank you for that :) Now I understand properly.
On Thu, Nov 8, 2018 at 11:45 PM Riley notifications@github.com wrote:
if you don't have a lockfile, cargo has the potential to pull newer packages than what you were previously using. It might not do that if we're up to date on everything, or it may have some logic to use cached packages on your system instead of pulling new ones. I'm not sure. but the lockfile is what states exactly what is in your app and how to get to that state again
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Aardwolf-Social/aardwolf/pull/158#issuecomment-437248815, or mute the thread https://github.com/notifications/unsubscribe-auth/AEQNJJM2sBwKZldQkmccRpd-SYbFR-U6ks5utQhogaJpZM4YVdTY .
This PR has been effectively replaced by #159
!!!! WARNING !!!!
This is a fairly MASSIVE pull request because this is where we switch from Handlebars to Tera for the template syntax (officially). It also adds the i18n_rocket functionality borrowed (stolen with permission x3c) from Plume-org.
!!! DO NOT MERGE THIS !!! There are LOTs of little fiddly bits, that have changed since the Actix work that @asonix has done. Merging without taking these into consideration will break a lot of things.