actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-20 20:48:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bin names in .crates.toml on win (#802)

Browse source 
`bins::BinFile::new` does not include `binary_ext` in the
`BinFile::base_name`.

Also add regression e2e-test.

Fixed #801

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-02-15 15:24:50 +11:00 • committed by GitHub
parent 30f7722131
commit 9874dca454
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/binstalk/src/bins.rs
View file

@ -4,7 +4,7 @@ use std::{
path::{self, Component, Path, PathBuf}, path::{self, Component, Path, PathBuf},
}; };
use compact_str::CompactString; use compact_str::{format_compact, CompactString};
use normalize_path::NormalizePath; use normalize_path::NormalizePath;
use serde::Serialize; use serde::Serialize;
use tinytemplate::TinyTemplate; use tinytemplate::TinyTemplate;
@ -141,7 +141,7 @@ impl BinFile {
}; };
Ok(Self { Ok(Self {
base_name: CompactString::from(base_name), base_name: format_compact!("{base_name}{binary_ext}"),
source, source,
dest, dest,
link, link,

17
e2e-tests/uninstall.sh Normal file
View file

@ -0,0 +1,17 @@
#!/bin/bash
set -euxo pipefail
unset CARGO_INSTALL_ROOT
export CARGO_HOME=$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-home')
othertmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'cargo-test')
export PATH="$CARGO_HOME/bin:$othertmpdir/bin:$PATH"
mkdir -p "$othertmpdir/bin"
# Copy it to bin to test use of env var `CARGO`
cp "./$1" "$othertmpdir/bin/"
cargo binstall --no-confirm cargo-watch
cargo uninstall cargo-watch

3
justfile
View file

@ -132,6 +132,7 @@ e2e-test-strategies: (e2e-test "strategies")
e2e-test-version-syntax: (e2e-test "version-syntax") e2e-test-version-syntax: (e2e-test "version-syntax")
e2e-test-upgrade: (e2e-test "upgrade") e2e-test-upgrade: (e2e-test "upgrade")
e2e-test-self-upgrade-no-symlink: (e2e-test "self-upgrade-no-symlink") e2e-test-self-upgrade-no-symlink: (e2e-test "self-upgrade-no-symlink")
e2e-test-uninstall: (e2e-test "uninstall")
# WinTLS (Windows in CI) does not have TLS 1.3 support # WinTLS (Windows in CI) does not have TLS 1.3 support
[windows] [windows]
@ -140,7 +141,7 @@ e2e-test-tls: (e2e-test "tls" "1.2")
[macos] [macos]
e2e-test-tls: (e2e-test "tls" "1.2") (e2e-test "tls" "1.3") e2e-test-tls: (e2e-test "tls" "1.2") (e2e-test "tls" "1.3")
e2e-tests: e2e-test-live e2e-test-manifest-path e2e-test-other-repos e2e-test-strategies e2e-test-version-syntax e2e-test-upgrade e2e-test-tls e2e-test-self-upgrade-no-symlink e2e-tests: e2e-test-live e2e-test-manifest-path e2e-test-other-repos e2e-test-strategies e2e-test-version-syntax e2e-test-upgrade e2e-test-tls e2e-test-self-upgrade-no-symlink e2e-test-uninstall
unit-tests: unit-tests:
{{cargo-bin}} test {{cargo-build-args}} {{cargo-bin}} test {{cargo-build-args}}