diff options
| author | bors <bors@rust-lang.org> | 2022-05-17 14:03:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-17 14:03:08 +0000 |
| commit | 7e95c14ea730c6b06f5760c8c92e69b9a6def828 (patch) | |
| tree | 473eef7a81fa79f0044478cf01fd008fe4c26acd | |
| parent | c5c442eee107ba3830b3c589090d158d63555976 (diff) | |
| parent | 21b6ce8b8efa5eb3b6658cad734170e47f477a17 (diff) | |
| download | rust-7e95c14ea730c6b06f5760c8c92e69b9a6def828.tar.gz rust-7e95c14ea730c6b06f5760c8c92e69b9a6def828.zip | |
Auto merge of #12292 - jonas-schievink:bump-extension-version, r=jonas-schievink
internal: Bump extension version
| -rw-r--r-- | editors/code/package.json | 2 | ||||
| -rw-r--r-- | xtask/src/dist.rs | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/editors/code/package.json b/editors/code/package.json index d7978bab473..04006d74345 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -4,7 +4,7 @@ "description": "Rust language support for Visual Studio Code", "private": true, "icon": "icon.png", - "version": "0.4.0-dev", + "version": "0.5.0-dev", "releaseTag": null, "publisher": "rust-lang", "repository": { diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs index 3c58fbb76de..2ea452377ee 100644 --- a/xtask/src/dist.rs +++ b/xtask/src/dist.rs @@ -10,6 +10,10 @@ use xshell::{cmd, Shell}; use crate::{date_iso, flags, project_root}; +const VERSION_STABLE: &str = "0.3"; +const VERSION_NIGHTLY: &str = "0.4"; +const VERSION_DEV: &str = "0.5"; // keep this one in sync with `package.json` + impl flags::Dist { pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> { let stable = sh.var("GITHUB_REF").unwrap_or_default().as_str() == "refs/heads/release"; @@ -25,10 +29,10 @@ impl flags::Dist { if let Some(patch_version) = self.client_patch_version { let version = if stable { - format!("0.2.{}", patch_version) + format!("{}.{}", VERSION_STABLE, patch_version) } else { // A hack to make VS Code prefer nightly over stable. - format!("0.3.{}", patch_version) + format!("{}.{}", VERSION_NIGHTLY, patch_version) }; let release_tag = if stable { date_iso(sh)? } else { "nightly".to_string() }; dist_client(sh, &version, &release_tag, &target)?; @@ -54,7 +58,10 @@ fn dist_client( let mut patch = Patch::new(sh, "./package.json")?; patch - .replace(r#""version": "0.4.0-dev""#, &format!(r#""version": "{}""#, version)) + .replace( + &format!(r#""version": "{}.0-dev""#, VERSION_DEV), + &format!(r#""version": "{}""#, version), + ) .replace(r#""releaseTag": null"#, &format!(r#""releaseTag": "{}""#, release_tag)) .replace(r#""$generated-start": {},"#, "") .replace(",\n \"$generated-end\": {}", "") |