rust-marker / marker

An experimental linting interface for Rust. Let's make custom lints a reality
https://rust-marker.github.io/marker/
Other
142 stars 11 forks source link

Rustc: Simplify `--sysroot` code after `rust#103660` and prepare `0.4.3-rc` #326

Closed xFrednet closed 11 months ago

xFrednet commented 11 months ago

The first commit is the same as rust-marker/marker#325

xFrednet commented 11 months ago

@Veetaha I think I broke the bash-test script, since I accidentally released the last v0.4.2 version from master instead of the hotfix/0.4 branch. Something in the replacement seems to act up, and the test script fails:

Logs ``` [...] Downgrading marker_utils v0.4.2 (/tmp/tmp.uGKpWhdFaV/marker_utils) -> v0.1.0 ❱ git diff --unified=1 diff --git a/scripts/release/set-version.diff b/- index 040a196..0000000 100644 --- a/scripts/release/set-version.diff +++ b/- @@ -7,56 +7,56 @@ === Cargo.lock === name = "cargo_marker" --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" dependencies = [ name = "marker_adapter" --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" dependencies = [ name = "marker_api" --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" dependencies = [ name = "marker_error" --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" dependencies = [ name = "marker_lints" --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" dependencies = [ name = "marker_rustc_driver" --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" dependencies = [ name = "marker_uilints" --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" dependencies = [ name = "marker_uitest" --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" dependencies = [ name = "marker_utils" --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" dependencies = [ === Cargo.toml === # region replace marker version dev --version = "X.Y.Z-dev" +-version = "X.Y.Z" +version = "0.1.0" # endregion replace marker version dev # region replace marker version dev --marker_adapter = { path = "./marker_adapter", version = "X.Y.Z-dev" } --marker_api = { path = "./marker_api", version = "X.Y.Z-dev" } --marker_error = { path = "./marker_error", version = "X.Y.Z-dev" } +-marker_adapter = { path = "./marker_adapter", version = "X.Y.Z" } +-marker_api = { path = "./marker_api", version = "X.Y.Z" } +-marker_error = { path = "./marker_error", version = "X.Y.Z" } +marker_adapter = { path = "./marker_adapter", version = "0.1.0" } +marker_api = { path = "./marker_api", version = "0.1.0" } +marker_error = { path = "./marker_error", version = "0.1.0" } marker_uitest = { path = "./marker_uitest", features = ["dev-build"] } --marker_utils = { path = "./marker_utils", version = "X.Y.Z-dev" } +-marker_utils = { path = "./marker_utils", version = "X.Y.Z" } +marker_utils = { path = "./marker_utils", version = "0.1.0" } # endregion replace marker version dev @@ -95,8 +95,8 @@ === cargo-marker/src/backend/driver.rs === // region replace marker version dev -- version: "X.Y.Z-dev".to_string(), -- api_version: "X.Y.Z-dev".to_string(), +- version: "X.Y.Z".to_string(), +- api_version: "X.Y.Z".to_string(), + version: "0.1.0".to_string(), + api_version: "0.1.0".to_string(), // endregion replace marker version dev ❗️ Error -------------------------------------------------------------------------- The test snapshot is outdated, or the release automation script is broken. If the change in the snapshot is expected run the following to update it. UPDATE_SNAP=1 ./scripts/release/test.sh ❱ rm -rf /tmp/tmp.uGKpWhdFaV Error: Process completed with exit code 1 ```

I've tried removing the -rc prefix but no help. Replacing all 0.5.0-dev with 0.4.0-dev seems to work. Do you think I should just push a commit with the 0.4.0-dev change to get this working?