Skip to content

Commit

Permalink
Merge pull request informalsystems#86 from confio/remove-cargo-lock
Browse files Browse the repository at this point in the history
Remove Cargo.lock
  • Loading branch information
ethanfrey authored May 5, 2022
2 parents 3d141d8 + d70135a commit eaffbe0
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 552 deletions.
13 changes: 9 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ jobs:
command: rustc --version; cargo --version; rustup --version
- restore_cache:
keys:
- v4-cargo-cache-rust:1.51.0-{{ arch }}-{{ checksum "Cargo.lock" }}
- v4-cargo-cache-rust:1.51.0-{{ arch }}-{{ checksum "Cargo.toml" }}
- run:
name: install protobuf dependencies
command: |
apt update
apt install -y libprotobuf-dev protobuf-compiler
- run:
name: Check all targets in std
command: cargo check --all
Expand All @@ -86,7 +91,7 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: v4-cargo-cache-rust:1.51.0-{{ arch }}-{{ checksum "Cargo.lock" }}
key: v4-cargo-cache-rust:1.51.0-{{ arch }}-{{ checksum "Cargo.toml" }}
- run:
name: Run all tests
command: cargo test --all
Expand All @@ -103,7 +108,7 @@ jobs:
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
- restore_cache:
keys:
- cargocache-v2-lint-rust:1.51.0-{{ checksum "Cargo.lock" }}
- cargocache-v2-lint-rust:1.51.0-{{ checksum "Cargo.toml" }}
- run:
name: Add rustfmt component
command: rustup component add rustfmt
Expand All @@ -125,4 +130,4 @@ jobs:
- target/debug/.fingerprint
- target/debug/build
- target/debug/deps
key: cargocache-v2-lint-rust:1.51.0-{{ checksum "Cargo.lock" }}
key: cargocache-v2-lint-rust:1.51.0-{{ checksum "Cargo.toml" }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea
3 changes: 2 additions & 1 deletion rust/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
target
.idea
.idea
Cargo.lock
Loading

0 comments on commit eaffbe0

Please sign in to comment.