From 77de40192e6c5f39c511f846850fb60881e8ee9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Sun, 26 Apr 2020 14:53:33 +0300 Subject: [PATCH] Use x86_64-unknown-linux-gnu for releases --- .github/workflows/release.yaml | 1 - xtask/src/dist.rs | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2c1192f072..3f52f31f80 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,7 +39,6 @@ jobs: with: toolchain: stable profile: minimal - target: x86_64-unknown-linux-musl override: true - name: Install Nodejs diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs index a56eeef8d2..aef68089e1 100644 --- a/xtask/src/dist.rs +++ b/xtask/src/dist.rs @@ -50,21 +50,19 @@ fn dist_server(nightly: bool) -> Result<()> { if cfg!(target_os = "linux") { std::env::set_var("CC", "clang"); run!( - "cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release - --target x86_64-unknown-linux-musl - " + "cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release" // We'd want to add, but that requires setting the right linker somehow // --features=jemalloc )?; if !nightly { - run!("strip ./target/x86_64-unknown-linux-musl/release/rust-analyzer")?; + run!("strip ./target/release/rust-analyzer")?; } } else { run!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release")?; } let (src, dst) = if cfg!(target_os = "linux") { - ("./target/x86_64-unknown-linux-musl/release/rust-analyzer", "./dist/rust-analyzer-linux") + ("./target/release/rust-analyzer", "./dist/rust-analyzer-linux") } else if cfg!(target_os = "windows") { ("./target/release/rust-analyzer.exe", "./dist/rust-analyzer-windows.exe") } else if cfg!(target_os = "macos") {