fixed paths in tar.gz build

golemfactory · Oct 15, 2020 · c7ba159 · c7ba159
1 parent 75bd766
commit c7ba159
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -121,8 +121,8 @@ jobs:
           cp target/x86_64-unknown-linux-musl/release/ya-runtime-vm "$TARGET_DIR/ya-runtime-vm/"
           cp runtime/conf/ya-runtime-vm.json "$TARGET_DIR/"
           cp -r runtime/poc/runtime "$TARGET_DIR/ya-runtime-vm/"
-          cp "runtime/init-container/initramfs.cpio.gz" "$TARGET_DIR/ya-runtime-vm/ya-runtime-vm/"
-          cp "runtime/init-container/vmlinuz-virt" "$TARGET_DIR/ya-runtime-vm/ya-runtime-vm/"
+          cp "runtime/init-container/initramfs.cpio.gz" "$TARGET_DIR/ya-runtime-vm/runtime/"
+          cp "runtime/init-container/vmlinuz-virt" "$TARGET_DIR/ya-runtime-vm/runtime/"
           (cd releases && tar czvf "ya-runtime-vm-${OS_NAME}-${TAG_NAME}.tar.gz" "ya-runtime-vm-${OS_NAME}-${TAG_NAME}")
           echo "::set-output name=artifact::ya-runtime-vm-${OS_NAME}-${TAG_NAME}.tar.gz"
           echo "::set-output name=media::application/tar+gzip"

diff --git a/runtime/build.rs b/runtime/build.rs
@@ -1,15 +1,15 @@
+use anyhow::Context;
 use std::env;
+use std::ops::Not;
 use std::path::PathBuf;
 use std::process::Command;
-use std::ops::Not;
-use anyhow::Context;
 
 static RERUN_IF_CHANGED: &str = "cargo:rerun-if-changed";
 
-fn main() -> anyhow::Result<()>{
+fn main() -> anyhow::Result<()> {
     // skip build for CI
     if env::var("CI").is_ok() {
-        return Ok(())
+        return Ok(());
     }
 
     let root_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
@@ -22,8 +22,7 @@ fn main() -> anyhow::Result<()>{
     if make_result.success().not() {
         if let Some(code) = make_result.code() {
             anyhow::bail!("make failed with code {:?}", code)
-        }
-        else {
+        } else {
             anyhow::bail!("make failed")
         }
     }