diff options
Diffstat (limited to 'xtask')
-rw-r--r-- | xtask/src/install.rs | 3 | ||||
-rw-r--r-- | xtask/src/lib.rs | 16 |
2 files changed, 16 insertions, 3 deletions
diff --git a/xtask/src/install.rs b/xtask/src/install.rs index 1d13b26da..f76467cac 100644 --- a/xtask/src/install.rs +++ b/xtask/src/install.rs | |||
@@ -122,7 +122,8 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { | |||
122 | if !installed_extensions.contains("rust-analyzer") { | 122 | if !installed_extensions.contains("rust-analyzer") { |
123 | bail!( | 123 | bail!( |
124 | "Could not install the Visual Studio Code extension. \ | 124 | "Could not install the Visual Studio Code extension. \ |
125 | Please make sure you have at least NodeJS 12.x together with the latest version of VS Code installed and try again." | 125 | Please make sure you have at least NodeJS 12.x together with the latest version of VS Code installed and try again. \ |
126 | Note that installing via xtask install does not work for VS Code Remote, instead you’ll need to install the .vsix manually." | ||
126 | ); | 127 | ); |
127 | } | 128 | } |
128 | 129 | ||
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs index e5da726ac..f48045d17 100644 --- a/xtask/src/lib.rs +++ b/xtask/src/lib.rs | |||
@@ -139,12 +139,15 @@ pub fn run_pre_cache() -> Result<()> { | |||
139 | } | 139 | } |
140 | 140 | ||
141 | fs2::remove_file("./target/.rustc_info.json")?; | 141 | fs2::remove_file("./target/.rustc_info.json")?; |
142 | let to_delete = ["ra_", "heavy_test"]; | 142 | let to_delete = ["ra_", "heavy_test", "xtask"]; |
143 | for &dir in ["./target/debug/deps", "target/debug/.fingerprint"].iter() { | 143 | for &dir in ["./target/debug/deps", "target/debug/.fingerprint"].iter() { |
144 | for entry in Path::new(dir).read_dir()? { | 144 | for entry in Path::new(dir).read_dir()? { |
145 | let entry = entry?; | 145 | let entry = entry?; |
146 | if to_delete.iter().any(|&it| entry.path().display().to_string().contains(it)) { | 146 | if to_delete.iter().any(|&it| entry.path().display().to_string().contains(it)) { |
147 | rm_rf(&entry.path())? | 147 | // Can't delete yourself on windows :-( |
148 | if !entry.path().ends_with("xtask.exe") { | ||
149 | rm_rf(&entry.path())? | ||
150 | } | ||
148 | } | 151 | } |
149 | } | 152 | } |
150 | } | 153 | } |
@@ -192,5 +195,14 @@ Release: release:{}[] | |||
192 | 195 | ||
193 | fs2::copy(project_root().join("./docs/user/readme.adoc"), website_root.join("manual.adoc"))?; | 196 | fs2::copy(project_root().join("./docs/user/readme.adoc"), website_root.join("manual.adoc"))?; |
194 | 197 | ||
198 | let tags = run!("git tag --list"; echo = false)?; | ||
199 | let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap(); | ||
200 | |||
201 | println!("\n git log {}..HEAD --merges --reverse", prev_tag); | ||
202 | |||
195 | Ok(()) | 203 | Ok(()) |
196 | } | 204 | } |
205 | |||
206 | fn is_release_tag(tag: &str) -> bool { | ||
207 | tag.len() == "2020-02-24".len() && tag.starts_with(|c: char| c.is_ascii_digit()) | ||
208 | } | ||