diff --git a/Cargo.lock b/Cargo.lock index 9746682c1..322fe4560 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3949,7 +3949,7 @@ dependencies = [ [[package]] name = "scarb" -version = "2.3.0-rc0" +version = "2.3.0-rc1" dependencies = [ "anyhow", "assert_fs", @@ -4024,7 +4024,7 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.3.0-rc0" +version = "2.3.0-rc1" dependencies = [ "cargo_metadata", "semver", @@ -4032,7 +4032,7 @@ dependencies = [ [[package]] name = "scarb-cairo-language-server" -version = "2.3.0-rc0" +version = "2.3.0-rc1" dependencies = [ "cairo-lang-language-server", "cairo-lang-utils", @@ -4042,7 +4042,7 @@ dependencies = [ [[package]] name = "scarb-cairo-run" -version = "2.3.0-rc0" +version = "2.3.0-rc1" dependencies = [ "anyhow", "assert_fs", @@ -4061,7 +4061,7 @@ dependencies = [ [[package]] name = "scarb-cairo-test" -version = "2.3.0-rc0" +version = "2.3.0-rc1" dependencies = [ "anyhow", "cairo-lang-compiler", diff --git a/Cargo.toml b/Cargo.toml index e002d6e4a..11e3df1e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ "resolver" = "2" [workspace.package] -version = "2.3.0-rc0" +version = "2.3.0-rc1" edition = "2021" authors = ["Software Mansion "] diff --git a/utils/scarb-build-metadata/src/lib.rs b/utils/scarb-build-metadata/src/lib.rs index b4fb3fe34..2c99f15de 100644 --- a/utils/scarb-build-metadata/src/lib.rs +++ b/utils/scarb-build-metadata/src/lib.rs @@ -35,19 +35,25 @@ mod tests { /// because this project is tightly coupled with it. #[test] fn scarb_version_is_bound_to_cairo_version() { - let nightly_build = crate::SCARB_VERSION.contains("nightly"); - - let normalize = |v| { - let mut v = Version::parse(v).unwrap(); - v.build = BuildMetadata::EMPTY; - if nightly_build { - v.pre = Prerelease::EMPTY; - } - v.to_string() - }; - - let scarb_version = normalize(crate::SCARB_VERSION); - let cairo_version = normalize(crate::CAIRO_VERSION); - assert_eq!(scarb_version, cairo_version); + let mut scarb = Version::parse(crate::SCARB_VERSION).unwrap(); + let mut cairo = Version::parse(crate::CAIRO_VERSION).unwrap(); + + scarb.build = BuildMetadata::EMPTY; + cairo.build = BuildMetadata::EMPTY; + + if scarb.pre.contains("nightly") { + scarb.pre = Prerelease::EMPTY; + cairo.pre = Prerelease::EMPTY; + } + + assert_eq!( + (scarb.major, scarb.minor, scarb.patch), + (cairo.major, cairo.minor, cairo.patch), + "versions not in sync:\nscarb {scarb}\ncairo {cairo}" + ); + assert!( + scarb.pre >= cairo.pre, + "versions not in sync:\nscarb {scarb}\ncairo {cairo}" + ); } }