Merge pull request #66 from ryankurte/macos-use-zip

Swap macos to zip, update binary lookup for binstall

.cargo/config

@@ -1,2 +1,11 @@
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"
+
+[target.armv7-unknown-linux-musleabihf]
+linker = "arm-linux-musleabihf-gcc"
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[target.aarch64-unknown-linux-musl]
+linker = "aarch64-linux-musl-gcc"

.github/workflows/rust.yml

@@ -26,7 +26,7 @@ jobs:
           - target: x86_64-apple-darwin
             os: macos-latest
             output: cargo-binstall
-            archive: tgz
+            archive: zip
           - target: armv7-unknown-linux-gnueabihf
             os: ubuntu-20.04
             output: cargo-binstall
@@ -83,14 +83,18 @@ jobs:
     - name: Copy and rename utility
       run: cp target/${{ matrix.target }}/release/${{ matrix.output }} ${{ matrix.output }}
 
-    - name: Create archive (tgz)
+    - name: Create archive (tgz, linux)
-      if: ${{ matrix.target != 'x86_64-pc-windows-msvc' }}
+      if: ${{ matrix.os != 'macos-latest' && matrix.os != 'windows-latest' }}
       run: tar -czvf cargo-binstall-${{ matrix.target }}.tgz ${{ matrix.output }}
     
-    - name: Create archive (zip)
+    - name: Create archive (zip, windows)
-      if: ${{ matrix.target == 'x86_64-pc-windows-msvc' }}
+      if: ${{ matrix.os == 'windows-latest' }}
       run: tar.exe -a -c -f cargo-binstall-${{ matrix.target }}.zip ${{ matrix.output }}
 
+    - name: Create archive (zip, macos)
+      if: ${{ matrix.os == 'macos-latest' }}
+      run: zip cargo-binstall-${{ matrix.target }}.zip ${{ matrix.output }}
+
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
@@ -122,7 +126,7 @@ jobs:
           - target: x86_64-apple-darwin
             os: macos-latest
             output: cargo-binstall
-            archive: tgz
+            archive: zip
           - target: x86_64-pc-windows-msvc
             os: windows-latest
             output: cargo-binstall.exe
@@ -136,13 +140,17 @@ jobs:
       with:
         name: cargo-binstall-${{ matrix.target }}.${{ matrix.archive }}
 
-    - name: "Extract build artifact (tgz)"
+    - name: "Extract build artifact (tgz, linux)"
-      if: ${{ matrix.target != 'x86_64-pc-windows-msvc' }}
+      if: ${{ matrix.os != 'windows-latest' && matrix.os != 'macos-latest' }}
       run: tar -xvf cargo-binstall-${{ matrix.target }}.tgz
 
-    - name: "Extract build artifact (zip)"
+    - name: "Extract build artifact (zip, windows)"
-      if: ${{ matrix.target == 'x86_64-pc-windows-msvc' }}
+      if: ${{ matrix.os == 'windows-latest' }}
       run: tar.exe -xvf cargo-binstall-${{ matrix.target }}.zip
     
+    - name: "Extract build artifact (zip, macos)"
+      if: ${{ matrix.os == 'macos-latest' }}
+      run: unzip cargo-binstall-${{ matrix.target }}.zip
+
     - name: "Run binstall"
       run: ./${{ matrix.output }} cargo-binstall --manifest-path . --no-confirm

Cargo.toml

@@ -15,6 +15,8 @@ bin-dir = "{ bin }{ format }"
 
 [package.metadata.binstall.overrides.x86_64-pc-windows-msvc]
 pkg-fmt = "zip"
+[package.metadata.binstall.overrides.x86_64-apple-darwin]
+pkg-fmt = "zip"
 
 [dependencies]
 crates_io_api = "0.7.0"

src/helpers.rs

@@ -50,7 +50,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(source: S, fmt: PkgFmt, path: P)
     match fmt {
         PkgFmt::Tar => {
             // Extract to install dir
-            debug!("Extracting from archive '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
+            debug!("Extracting from tar archive '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
 
             let dat = std::fs::File::open(source)?;
             let mut tar = Archive::new(dat);
@@ -59,7 +59,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(source: S, fmt: PkgFmt, path: P)
         },
         PkgFmt::Tgz => {
             // Extract to install dir
-            debug!("Decompressing from archive '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
+            debug!("Decompressing from tgz archive '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
 
             let dat = std::fs::File::open(source)?;
             let tar = GzDecoder::new(dat);
@@ -69,7 +69,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(source: S, fmt: PkgFmt, path: P)
         },
         PkgFmt::Txz => {
             // Extract to install dir
-            debug!("Decompressing from archive '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
+            debug!("Decompressing from txz archive '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
 
             let dat = std::fs::File::open(source)?;
             let tar = XzDecoder::new(dat);
@@ -79,7 +79,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(source: S, fmt: PkgFmt, path: P)
         },
         PkgFmt::Zip => {
             // Extract to install dir
-            debug!("Decompressing from archive '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
+            debug!("Decompressing from zip archive '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
 
             let dat = std::fs::File::open(source)?;
             let mut zip = ZipArchive::new(dat)?;
@@ -87,7 +87,7 @@ pub fn extract<S: AsRef<Path>, P: AsRef<Path>>(source: S, fmt: PkgFmt, path: P)
             zip.extract(path)?;
         },
         PkgFmt::Bin => {
-            debug!("Copying data from archive '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
+            debug!("Copying binary '{:?}' to `{:?}`", source.as_ref(), path.as_ref());
             // Copy to install dir
             std::fs::copy(source, path)?;
         },