From 832c51f0258aed2c97b88f6a622da6f3c0ac026e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Tue, 31 May 2022 17:17:04 +1200 Subject: [PATCH 1/6] Add apple m1 builds --- .github/workflows/rust.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 2cbb0324..e31acbbf 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -29,6 +29,11 @@ jobs: output: cargo-binstall archive: zip use-cross: false + - target: aarch64-apple-darwin + os: macos-latest + output: cargo-binstall + archive: zip + use-cross: false - target: armv7-unknown-linux-gnueabihf os: ubuntu-20.04 output: cargo-binstall From 3a1d42fd6b065e42cc32c5419e084c0a4975cc9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Tue, 31 May 2022 17:19:56 +1200 Subject: [PATCH 2/6] Default to musl builds on the readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c28d105e..7ccd6a1c 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,14 @@ To support `binstall` maintainers must add configuration values to `Cargo.toml` To get started _using_ `cargo-binstall`, first install the binary (either via `cargo install cargo-binstall` or by downloading a pre-compiled [release](https://github.com/ryankurte/cargo-binstall/releases). -linux x86_64: +linux x86\_64: ``` -wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-gnu.tgz +wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz ``` linux armv7: ``` -wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-armv7-unknown-linux-gnueabihf.tgz +wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-armv7-unknown-linux-musleabihf.tgz ``` macos x86_64: From c1fd2398f06c09094296adfeaa5521d8d7c81061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Tue, 31 May 2022 17:24:04 +1200 Subject: [PATCH 3/6] Add linux arm64 to readme --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 7ccd6a1c..20dc92d7 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,11 @@ linux armv7: wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-armv7-unknown-linux-musleabihf.tgz ``` +linux arm64: +``` +wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-aarch64-unknown-linux-musleabihf.tgz +``` + macos x86_64: ``` wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-apple-darwin.zip From 22f509fb72826d172e5c624c89371416fd03daaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Tue, 31 May 2022 17:24:42 +1200 Subject: [PATCH 4/6] Add macos arm64 to readme --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 20dc92d7..dcbd14b1 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,11 @@ macos x86_64: wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-apple-darwin.zip ``` +macos M1: +``` +wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-aarch64-apple-darwin.zip +``` + windows x86_64: ``` wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-pc-windows-msvc.zip From bee95cdb2759bbaa2aa300cbdc827704188e7fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Tue, 31 May 2022 17:24:52 +1200 Subject: [PATCH 5/6] Fix markdown --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dcbd14b1..11c58489 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ linux arm64: wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-aarch64-unknown-linux-musleabihf.tgz ``` -macos x86_64: +macos x86\_64: ``` wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-apple-darwin.zip ``` @@ -32,7 +32,7 @@ macos M1: wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-aarch64-apple-darwin.zip ``` -windows x86_64: +windows x86\_64: ``` wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-pc-windows-msvc.zip ``` From 151998a1ebb55b452d544a300a45baa2055cf631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= Date: Tue, 31 May 2022 17:25:34 +1200 Subject: [PATCH 6/6] Cleanup yaml --- .github/workflows/rust.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e31acbbf..9ff74d56 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -103,7 +103,7 @@ jobs: - name: Create archive (tgz, linux) if: ${{ matrix.os != 'macos-latest' && matrix.os != 'windows-latest' }} run: tar -czvf cargo-binstall-${{ matrix.target }}.tgz ${{ matrix.output }} - + - name: Create archive (zip, windows) if: ${{ matrix.os == 'windows-latest' }} run: tar.exe -a -c -f cargo-binstall-${{ matrix.target }}.zip ${{ matrix.output }} @@ -157,14 +157,6 @@ jobs: - uses: actions/checkout@v2 - uses: FranzDiebold/github-env-vars-action@v1.2.1 - - name: Configure toolchain - if: ${{ matrix.target == 'x86_64-unknown-linux-musl' }} - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.target }} - override: true - - uses: actions/download-artifact@v2 with: name: cargo-binstall-${{ matrix.target }}.${{ matrix.archive }} @@ -176,7 +168,7 @@ jobs: - name: "Extract build artifact (zip, windows)" 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