Merge pull request #150 from pulp-platform/windows

Add Windows support & release

Author: micprog

.github/workflows/ci.yml

@@ -35,6 +35,21 @@ jobs:
         run: tests/run_all.sh
         shell: bash
 
+  test-windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+      - name: Build
+        run: cargo build
+      - name: Cargo Test
+        run: cargo test --all
+      - name: Run unit-tests
+        run: tests/run_all.sh
+        shell: bash
+
   clippy_check:
     name: Clippy
     runs-on: ubuntu-latest

.github/workflows/release.yaml

@@ -127,7 +127,7 @@ jobs:
           rustup target add aarch64-apple-darwin
           cargo install universal2
       - name: MacOS Build
-        run: cargo universal2 --release
+        run: cargo-universal2 --release
       - name: Get Artifact Name
         run: |
           if [[ "$GITHUB_REF" =~ ^refs/tags/v.*$ ]]; then \
@@ -151,3 +151,38 @@ jobs:
           asset_path: ${{ env.ARTIFACT_PATHNAME }}
           asset_name: ${{ env.ARTIFACT_NAME }}
           asset_content_type: application/tar.gz
+  release-windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+      - name: Build
+        run: cargo build --release
+      - name: Get Artifact Name
+        shell: bash
+        run: |
+          if [[ "$GITHUB_REF" =~ ^refs/tags/v.*$ ]]; then \
+            PKG_VERSION=$(echo $GITHUB_REF | sed -n 's/^refs\/tags\/v//p'); \
+          else \
+            PKG_VERSION=$(echo $GITHUB_REF | sed -n 's/^refs\/tags\///p'); \
+          fi
+          ARTIFACT_PATHNAME="bender-$PKG_VERSION-x86_64-pc-windows-msvc.tar.gz"
+          ARTIFACT_NAME=$(basename $ARTIFACT_PATHNAME)
+          echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV
+          echo "ARTIFACT_PATHNAME=${ARTIFACT_PATHNAME}" >> $GITHUB_ENV
+      - name: Create Package
+        run: |
+          cp target/release/bender.exe .
+          & 'C:\Program Files\Git\usr\bin\tar.exe' czf $Env:ARTIFACT_PATHNAME --owner=0 --group=0 bender.exe
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ env.ARTIFACT_PATHNAME }}
+          asset_name: ${{ env.ARTIFACT_NAME }}
+          asset_content_type: application/tar.gz

Cargo.lock

@@ -33,3 +33,6 @@ glob = "0.3"
 walkdir = "2"
 subst = "0.3"
 tera = "1.19"
+
+[target.'cfg(windows)'.dependencies]
+dunce = "1.0.4"

Cargo.toml

@@ -5,10 +5,15 @@
 
 use std;
 use std::ffi::OsString;
-use std::fs::{canonicalize, metadata};
 use std::path::{Path, PathBuf};
 use std::process::Command as SysCommand;
 
+#[cfg(unix)]
+use std::fs::{canonicalize, metadata};
+
+#[cfg(windows)]
+use dunce::canonicalize;
+
 use clap::parser::ValuesRef;
 use clap::{Arg, ArgAction, Command};
 use serde_yaml;
@@ -251,7 +256,7 @@ pub fn main() -> Result<()> {
                     }
                     None => None,
                 };
-                std::os::unix::fs::symlink(&pkg_path, path).map_err(|cause| {
+                symlink_dir(&pkg_path, path).map_err(|cause| {
                     Error::chain(
                         format!(
                             "Failed to create symlink to {:?} at path {:?}.",
@@ -291,10 +296,21 @@ pub fn main() -> Result<()> {
     }
 }
 
+#[cfg(target_family = "unix")]
+fn symlink_dir(p: &Path, q: &Path) -> Result<()> {
+    Ok(std::os::unix::fs::symlink(p, q)?)
+}
+
+#[cfg(target_os = "windows")]
+fn symlink_dir(p: &Path, q: &Path) -> Result<()> {
+    Ok(std::os::windows::fs::symlink_dir(p, q)?)
+}
+
 /// Find the root directory of a package.
 ///
 /// Traverses the directory hierarchy upwards until a `Bender.yml` file is found.
 fn find_package_root(from: &Path) -> Result<PathBuf> {
+    #[cfg(unix)]
     use std::os::unix::fs::MetadataExt;
 
     // Canonicalize the path. This will resolve any intermediate links.
@@ -304,7 +320,9 @@ fn find_package_root(from: &Path) -> Result<PathBuf> {
 
     // Look up the device at the current path. This information will then be
     // used to stop at filesystem boundaries.
+    #[cfg(unix)]
     let limit_rdev: Option<_> = metadata(&path).map(|m| m.dev()).ok();
+    #[cfg(unix)]
     debugln!("find_package_root: limit rdev = {:?}", limit_rdev);
 
     // Step upwards through the path hierarchy.
@@ -326,13 +344,16 @@ fn find_package_root(from: &Path) -> Result<PathBuf> {
         }
 
         // Abort if we have crossed the filesystem boundary.
-        let rdev: Option<_> = metadata(&path).map(|m| m.dev()).ok();
-        debugln!("find_package_root: rdev = {:?}", rdev);
-        if rdev != limit_rdev {
-            return Err(Error::new(format!(
-                "No manifest (`Bender.yml` file) found. Stopped searching at filesystem boundary {:?}.",
-                tested_path
-            )));
+        #[cfg(unix)]
+        {
+            let rdev: Option<_> = metadata(&path).map(|m| m.dev()).ok();
+            debugln!("find_package_root: rdev = {:?}", rdev);
+            if rdev != limit_rdev {
+                return Err(Error::new(format!(
+                    "No manifest (`Bender.yml` file) found. Stopped searching at filesystem boundary {:?}.",
+                    tested_path
+                )));
+            }
         }
     }
 
@@ -358,7 +379,9 @@ pub fn read_manifest(path: &Path) -> Result<Manifest> {
 
 /// Load a configuration by traversing a directory hierarchy upwards.
 fn load_config(from: &Path) -> Result<Config> {
+    #[cfg(unix)]
     use std::os::unix::fs::MetadataExt;
+
     let mut out = PartialConfig::new();
 
     // Canonicalize the path. This will resolve any intermediate links.
@@ -368,7 +391,9 @@ fn load_config(from: &Path) -> Result<Config> {
 
     // Look up the device at the current path. This information will then be
     // used to stop at filesystem boundaries.
+    #[cfg(unix)]
     let limit_rdev: Option<_> = metadata(&path).map(|m| m.dev()).ok();
+    #[cfg(unix)]
     debugln!("load_config: limit rdev = {:?}", limit_rdev);
 
     // Step upwards through the path hierarchy.
@@ -390,10 +415,13 @@ fn load_config(from: &Path) -> Result<Config> {
         }
 
         // Abort if we have crossed the filesystem boundary.
-        let rdev: Option<_> = metadata(&path).map(|m| m.dev()).ok();
-        debugln!("load_config: rdev = {:?}", rdev);
-        if rdev != limit_rdev {
-            break;
+        #[cfg(unix)]
+        {
+            let rdev: Option<_> = metadata(&path).map(|m| m.dev()).ok();
+            debugln!("load_config: rdev = {:?}", rdev);
+            if rdev != limit_rdev {
+                break;
+            }
         }
     }
 

src/cli.rs

@@ -288,7 +288,7 @@ pub fn run(sess: &Session, path: &Path, matches: &ArgMatches) -> Result<()> {
                     }
                     None => None,
                 };
-                std::os::unix::fs::symlink(&pkg_path, link_path).map_err(|cause| {
+                symlink_dir(&pkg_path, link_path).map_err(|cause| {
                     Error::chain(
                         format!(
                             "Failed to create symlink to {:?} at path {:?}.",
@@ -307,3 +307,13 @@ pub fn run(sess: &Session, path: &Path, matches: &ArgMatches) -> Result<()> {
 
     Ok(())
 }
+
+#[cfg(unix)]
+fn symlink_dir(p: &Path, q: &Path) -> Result<()> {
+    Ok(std::os::unix::fs::symlink(p, q)?)
+}
+
+#[cfg(windows)]
+fn symlink_dir(p: &Path, q: &Path) -> Result<()> {
+    Ok(std::os::windows::fs::symlink_dir(p, q)?)
+}

src/cmd/clone.rs

@@ -698,10 +698,7 @@ pub fn copy_recursively(
             )?;
         } else if filetype.is_symlink() {
             let orig = std::fs::read_link(entry.path());
-            std::os::unix::fs::symlink(
-                orig.unwrap(),
-                destination.as_ref().join(entry.file_name()),
-            )?;
+            symlink_dir(orig.unwrap(), destination.as_ref().join(entry.file_name()))?;
         } else {
             std::fs::copy(entry.path(), destination.as_ref().join(entry.file_name())).map_err(
                 |cause| {
@@ -741,3 +738,13 @@ pub fn extend_paths(
         })
         .collect::<Result<_>>()
 }
+
+#[cfg(unix)]
+fn symlink_dir(p: PathBuf, q: PathBuf) -> Result<()> {
+    Ok(std::os::unix::fs::symlink(p, q)?)
+}
+
+#[cfg(windows)]
+fn symlink_dir(p: PathBuf, q: PathBuf) -> Result<()> {
+    Ok(std::os::windows::fs::symlink_dir(p, q)?)
+}

src/cmd/vendor.rs

@@ -954,6 +954,7 @@ pub enum LockedSource {
     Registry(String),
 }
 
+#[cfg(unix)]
 fn env_path_from_string(path_str: String) -> Result<PathBuf> {
     Ok(PathBuf::from(
         subst::substitute(&path_str, &subst::Env).map_err(|cause| {
@@ -964,3 +965,8 @@ fn env_path_from_string(path_str: String) -> Result<PathBuf> {
         })?,
     ))
 }
+
+#[cfg(windows)]
+fn env_path_from_string(path_str: String) -> Result<PathBuf> {
+    Ok(PathBuf::from(path_str))
+}

src/config.rs

@@ -24,6 +24,9 @@ extern crate subst;
 extern crate tempfile;
 extern crate typed_arena;
 
+#[cfg(windows)]
+extern crate dunce;
+
 #[macro_use]
 pub mod error;
 pub mod cli;

src/main.rs

@@ -7,7 +7,6 @@
 
 use std;
 use std::fmt;
-use std::fs::canonicalize;
 use std::io::Write;
 use std::iter::FromIterator;
 use std::mem::swap;
@@ -16,6 +15,12 @@ use std::sync::atomic::AtomicUsize;
 use std::sync::{Arc, Mutex};
 use std::time::SystemTime;
 
+#[cfg(unix)]
+use std::fs::canonicalize;
+
+#[cfg(windows)]
+use dunce::canonicalize;
+
 use crate::futures::{FutureExt, TryFutureExt};
 use async_recursion::async_recursion;
 use futures::future::{self, join_all};