Skip to content

Commit

Permalink
rust: Track Cargo.lock, treat them as opaque
Browse files Browse the repository at this point in the history
Cargo.lock files pin the versions of all transitive dependencies, and
are left that way by Cargo unless requested manually (`cargo update`) or
necessitated by a change in dependencies (if the manually maintained
Cargo.toml says `>0.5.2` and .lock says `0.5.1`, the latter is reset).

They are now fixed to ensure that third party changes do not break RIOT
CI builds; for updates, the changes from a `cargo update` can still be
committed and then run through CI checks. (This is analogous to how pkg
versions are pinned).

Lock files are set to binary because their diffs are usually not
practical to read.
  • Loading branch information
chrysn committed Nov 18, 2021
1 parent 49023a9 commit d1b5fbe
Show file tree
Hide file tree
Showing 4 changed files with 1,677 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.a binary
*.patch binary
Cargo.lock binary
# Default conflict marker size is 7 which causes some of the headings in
# release-notes.txt to trigger git diff --check: 'leftover conflict marker'
# when the heading is exactly 7 characters long.
Expand Down
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,3 @@ keys/

# custom clang-tidy flags, also used when using clangd language server
.clang-tidy

# Rust Cargo lock files
#
# These would be versioned in full applications, but for demos it's convenient
# to ignore them. (Also, they'd change easily, causing visual clutter to
# users).
Cargo.lock
Loading

0 comments on commit d1b5fbe

Please sign in to comment.