File tree Expand file tree Collapse file tree 5 files changed +66
-38
lines changed Expand file tree Collapse file tree 5 files changed +66
-38
lines changed Original file line number Diff line number Diff line change @@ -2,8 +2,6 @@ language: rust
2
2
sudo : false
3
3
rust : stable
4
4
cache : cargo
5
- env :
6
- global : CARGO_VENDOR_VERSION=0.1.23
7
5
matrix :
8
6
include :
9
7
- env : TARGET=x86_64-unknown-linux-musl
@@ -17,9 +15,6 @@ matrix:
17
15
# packages:
18
16
# - gcc-arm-linux-gnueabihf
19
17
install :
20
- - curl -sSfL https://github.com/alexcrichton/cargo-vendor/releases/download/${CARGO_VENDOR_VERSION}/cargo-vendor-${CARGO_VENDOR_VERSION}-x86_64-unknown-linux-musl.tar.gz
21
- | tar xzf - -C $HOME/bin --strip-components=1
22
- - cargo vendor --version
23
18
- rustup target add $TARGET
24
19
script :
25
20
- if [[ $TARGET == "aarch64-unknown-linux-musl" ]]; then sudo apt-get install -y --force-yes --no-install-recommends gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross; fi
Original file line number Diff line number Diff line change @@ -6,4 +6,4 @@ edition = "2018"
6
6
7
7
[dependencies ]
8
8
nix = " 0.13.*"
9
- tempdir = " 0.* "
9
+ tempfile = " 3 "
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ use std::path::Path;
14
14
use std:: path:: PathBuf ;
15
15
use std:: process;
16
16
use std:: string:: String ;
17
- use tempdir :: TempDir ;
17
+ use tempfile :: TempDir ;
18
18
19
19
const NONE : Option < & ' static [ u8 ] > = None ;
20
20
@@ -235,7 +235,7 @@ fn main() {
235
235
process:: exit ( 1 ) ;
236
236
}
237
237
let tempdir =
238
- TempDir :: new ( "nix" ) . expect ( "failed to create temporary directory for mount point" ) ;
238
+ TempDir :: new ( ) . expect ( "failed to create temporary directory for mount point" ) ;
239
239
let rootdir = PathBuf :: from ( tempdir. path ( ) ) ;
240
240
241
241
let nixdir = fs:: canonicalize ( & args[ 1 ] )
Original file line number Diff line number Diff line change 1
1
use std:: env;
2
2
use std:: path:: PathBuf ;
3
3
use std:: process:: Command ;
4
- use tempdir :: TempDir ;
4
+ use tempfile :: TempDir ;
5
5
6
6
#[ test]
7
7
fn run_nix_install ( ) {
8
8
let root = PathBuf :: from ( env:: var_os ( "CARGO_MANIFEST_DIR" ) . unwrap ( ) ) ;
9
9
let cmd_path = root. join ( "target/debug/nix-user-chroot" ) ;
10
10
assert ! ( cmd_path. exists( ) ) ;
11
11
12
- let tempdir = TempDir :: new ( "nix-install" ) . unwrap ( ) ;
12
+ let tempdir = TempDir :: new ( ) . unwrap ( ) ;
13
13
14
14
let result = Command :: new ( cmd_path)
15
15
. args ( & [
You can’t perform that action at this time.
0 commit comments