Skip to content

Commit

Permalink
Set MSRV on tutorial Cargo.tomls to avoid introducing lockfile v4 (#5668
Browse files Browse the repository at this point in the history
)

Attempt 2. #5649 didn't work
since the makefile itself calls cargo on non-pinned rust a couple times.
  • Loading branch information
Manishearth authored Oct 11, 2024
1 parent 55d7e6f commit 378a0e7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
13 changes: 0 additions & 13 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,6 @@ description = "Run all tests for the CI 'test-c' job"
category = "CI"
dependencies = [
"test-c",
# Can be removed after LLVM nightly is updated past May 2024, but it's fine to keep in
# to prevent such problems in the future
"internal-reset-tutorial-lockfiles",
"test-c-tiny",
"test-cpp",
]
Expand All @@ -131,9 +128,6 @@ description = "Run all tests for the CI 'test-js' job"
category = "CI"
dependencies = [
"test-npm",
# Can be removed after LLVM nightly is updated past May 2024, but it's fine to keep in
# to prevent such problems in the future
"internal-reset-tutorial-lockfiles",
"test-tinywasm",
]

Expand Down Expand Up @@ -349,10 +343,3 @@ else
echo "forced-toolchain environment not required"
end
'''

[tasks.internal-reset-tutorial-lockfiles]
description = "Reset changes to tutorial lockfiles (useful to clean up between CI jobs)"
category = "ICU4X CI internal"
command = "git"
args = ["checkout", "@", "--", "tutorials/**/Cargo.lock"]

2 changes: 2 additions & 0 deletions tutorials/c-tiny/fixeddecimal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
[package]
name = "unused"
version = "0.0.0"
# To ensure it stays on older lockfiles. Update when our pinned nightly supports lockfile v4
rust-version = "1.71.1"

[lib]
path = "unused"
Expand Down
3 changes: 3 additions & 0 deletions tutorials/c-tiny/segmenter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
[package]
name = "unused"
version = "0.0.0"
# To ensure it stays on older lockfiles. Update when our pinned nightly supports lockfile v4
rust-version = "1.71.1"


[lib]
path = "unused"
Expand Down
3 changes: 3 additions & 0 deletions tutorials/js-tiny/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
[package]
name = "unused"
version = "0.0.0"
# To ensure it stays on older lockfiles. Update when our pinned nightly supports lockfile v4
rust-version = "1.71.1"


[lib]
path = "unused"
Expand Down

0 comments on commit 378a0e7

Please sign in to comment.