Swap macos to zip, update binary lookup for binstall

This commit is contained in:
ryan kurte 2021-10-08 11:38:38 +13:00
parent 7d0b700ae2
commit 87449e29e7
3 changed files with 29 additions and 10 deletions

View file

@ -1,2 +1,11 @@
[target.armv7-unknown-linux-gnueabihf] [target.armv7-unknown-linux-gnueabihf]
linker = "arm-linux-gnueabihf-gcc" 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"

View file

@ -26,7 +26,7 @@ jobs:
- target: x86_64-apple-darwin - target: x86_64-apple-darwin
os: macos-latest os: macos-latest
output: cargo-binstall output: cargo-binstall
archive: tgz archive: zip
- target: armv7-unknown-linux-gnueabihf - target: armv7-unknown-linux-gnueabihf
os: ubuntu-20.04 os: ubuntu-20.04
output: cargo-binstall output: cargo-binstall
@ -83,14 +83,18 @@ jobs:
- name: Copy and rename utility - name: Copy and rename utility
run: cp target/${{ matrix.target }}/release/${{ matrix.output }} ${{ matrix.output }} 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 }} 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 }} 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 - name: Upload artifacts
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
with: with:
@ -122,7 +126,7 @@ jobs:
- target: x86_64-apple-darwin - target: x86_64-apple-darwin
os: macos-latest os: macos-latest
output: cargo-binstall output: cargo-binstall
archive: tgz archive: zip
- target: x86_64-pc-windows-msvc - target: x86_64-pc-windows-msvc
os: windows-latest os: windows-latest
output: cargo-binstall.exe output: cargo-binstall.exe
@ -136,13 +140,17 @@ jobs:
with: with:
name: cargo-binstall-${{ matrix.target }}.${{ matrix.archive }} 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 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 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" - name: "Run binstall"
run: ./${{ matrix.output }} cargo-binstall --manifest-path . --no-confirm run: ./${{ matrix.output }} cargo-binstall --manifest-path . --no-confirm

View file

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