Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix release

Browse source
This commit is contained in:
Aleksey Kladov 2020-03-23 14:33:44 +01:00
parent f8fd242199
commit 59f6bf87d6
3 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/release.yaml vendored
View file

@ -49,11 +49,15 @@ jobs:
node-version: 12.x node-version: 12.x
- name: Dist - name: Dist
if: github.ref == 'refs/heads/release' if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/release'
run: cargo xtask dist --version 0.2.$GITHUB_RUN_NUMBER --tag $(date --iso --utc) run: cargo xtask dist --client --version 0.2.$GITHUB_RUN_NUMBER --tag $(date --iso --utc)
- name: Dist - name: Dist
if: github.ref != 'refs/heads/release' if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/release'
run: cargo xtask dist --client --version 0.3.$GITHUB_RUN_NUMBER-nightly --tag nightly
- name: Dist
if: matrix.os != 'ubuntu-latest'
run: cargo xtask dist --version 0.3.$GITHUB_RUN_NUMBER-nightly --tag nightly run: cargo xtask dist --version 0.3.$GITHUB_RUN_NUMBER-nightly --tag nightly
- name: Upload artifacts - name: Upload artifacts

11
xtask/src/dist.rs
View file

@ -7,13 +7,18 @@ use crate::{
project_root, project_root,
}; };
pub fn run_dist(version: &str, release_tag: &str) -> Result<()> { pub struct ClientOpts {
pub version: String,
pub release_tag: String,
}
pub fn run_dist(client_opts: Option<ClientOpts>) -> Result<()> {
let dist = project_root().join("dist"); let dist = project_root().join("dist");
rm_rf(&dist)?; rm_rf(&dist)?;
fs2::create_dir_all(&dist)?; fs2::create_dir_all(&dist)?;
if cfg!(target_os = "linux") { if let Some(ClientOpts { version, release_tag}) = client_opts {
dist_client(version, release_tag)?; dist_client(&version, &release_tag)?;
} }
dist_server()?; dist_server()?;
Ok(()) Ok(())

14
xtask/src/main.rs
View file

@ -13,7 +13,7 @@ use std::env;
use pico_args::Arguments; use pico_args::Arguments;
use xtask::{ use xtask::{
codegen::{self, Mode}, codegen::{self, Mode},
dist::run_dist, dist::{ClientOpts, run_dist},
install::{ClientOpt, InstallCmd, ServerOpt}, install::{ClientOpt, InstallCmd, ServerOpt},
not_bash::pushd, not_bash::pushd,
pre_commit, project_root, run_clippy, run_fuzzer, run_pre_cache, run_release, run_rustfmt, pre_commit, project_root, run_clippy, run_fuzzer, run_pre_cache, run_release, run_rustfmt,
@ -103,10 +103,16 @@ FLAGS:
run_release(dry_run) run_release(dry_run)
} }
"dist" => { "dist" => {
let version: String = args.value_from_str("--version")?; let client_opts = if args.contains("--client") {
let release_tag: String = args.value_from_str("--tag")?; Some(ClientOpts {
version: args.value_from_str("--version")?,
release_tag: args.value_from_str("--tag")?,
})
} else {
None
};
args.finish()?; args.finish()?;
run_dist(&version, &release_tag) run_dist(client_opts)
} }
_ => { _ => {
eprintln!( eprintln!(