Merge remote-tracking branch 'origin/master' into support-arm-releases

Schniz · Oct 25, 2020 · aa6f45d · aa6f45d
2 parents 60424d2 + 7e13205
commit aa6f45d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 25 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: hecrj/setup-rust-action@v1
       with:
         rust-version: stable
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: cargo fmt
       run: cargo fmt -- --check
 
@@ -26,7 +26,7 @@ jobs:
     - uses: hecrj/setup-rust-action@v1
       with:
         rust-version: stable
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Run tests
       run: cargo test -- --skip=feature_tests
 
@@ -45,7 +45,7 @@ jobs:
     - uses: hecrj/setup-rust-action@v1
       with:
         rust-version: stable
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Run tests
       run: cargo test -- feature_tests
 
@@ -56,7 +56,7 @@ jobs:
     - uses: hecrj/setup-rust-action@v1
       with:
         rust-version: stable
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Build release binary
       run: cargo build --release
       env:
@@ -77,7 +77,7 @@ jobs:
     - uses: hecrj/setup-rust-action@v1
       with:
         rust-version: stable
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Build release binary
       run: cargo build --release
       env:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 build = "build.rs"
 
 [dependencies]
-serde = { version = "1.0.116", features = ["derive"] }
+serde = { version = "1.0.117", features = ["derive"] }
 clap = "2.33.3"
 structopt = "0.3.20"
 reqwest = { version = "0.10.8", features = ["blocking", "json", "rustls-tls", "brotli"], default-features = false }
@@ -22,9 +22,10 @@ tempfile = "3.1.0"
 indoc = "1.0.3"
 snafu = { version = "0.6.9", features = ["backtrace"] }
 log = "0.4.11"
-env_logger = "0.7.1"
+env_logger = "0.8.1"
 atty = "0.2.14"
 encoding_rs_io = "0.1.7"
+dircpy = "0.3.4"
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"

diff --git a/src/directory_portal.rs b/src/directory_portal.rs
@@ -1,3 +1,4 @@
+use dircpy::copy_dir;
 use log::*;
 use std::path::Path;
 use tempfile::{tempdir, TempDir};
@@ -21,7 +22,8 @@ impl<P: AsRef<Path>> DirectoryPortal<P> {
             self.temp_dir.path(),
             self.target.as_ref()
         );
-        std::fs::rename(&self.temp_dir, &self.target)?;
+        copy_dir(&self.temp_dir, &self.target)?;
+        std::fs::remove_dir_all(&self.temp_dir)?;
         Ok(self.target)
     }
 }