language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: correct version string to contain hash, build date and channel

Browse source
This commit is contained in:
Aleksey Kladov 2021-04-24 13:36:45 +03:00
parent 43ea1bb9b9
commit 8d54fd105c
2 changed files with 47 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xtask/src/dist.rs
View file

@ -7,7 +7,7 @@ use std::{
use anyhow::Result;
use flate2::{write::GzEncoder, Compression};
use xshell::{cmd, cp, mkdir_p, pushd, read_file, rm_rf, write_file};
use xshell::{cmd, cp, mkdir_p, pushd, pushenv, read_file, rm_rf, write_file};
use crate::{date_iso, project_root};
@ -26,7 +26,8 @@ impl DistCmd {
let release_tag = if self.nightly { "nightly".to_string() } else { date_iso()? };
dist_client(&version, &release_tag)?;
}
dist_server()?;
let release_channel = if self.nightly { "nightly" } else { "stable" };
dist_server(release_channel)?;
Ok(())
}
}
@ -59,7 +60,8 @@ fn dist_client(version: &str, release_tag: &str) -> Result<()> {
Ok(())
}
fn dist_server() -> Result<()> {
fn dist_server(release_channel: &str) -> Result<()> {
let _e = pushenv("RUST_ANALYZER_CHANNEL", release_channel);
let target = get_target();
if target.contains("-linux-gnu") || target.contains("-linux-musl") {
env::set_var("CC", "clang");