Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support aarch64 on darwin #165

Merged
merged 12 commits into from
Feb 25, 2024
Merged

Support aarch64 on darwin #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3d3b4cc
Add failing test for arm
kachick Feb 25, 2024
f45cdc5
This will work in latest cargo-make version, but older may not have b…
kachick Feb 25, 2024
4f89cf5
Update CI to ignore old versions in M1 mac
kachick Feb 25, 2024
7523159
Exclude syntax requires exact match
kachick Feb 25, 2024
492ab43
Exclude looks like working under JSON comparing
kachick Feb 25, 2024
4510b64
YAML matrix is hard for human
kachick Feb 25, 2024
6defb90
Fix a typo
kachick Feb 25, 2024
ef0dd06
Make sure this plugin can be developed on supported env
kachick Feb 25, 2024
71d1fb9
Add same matrix also in mise
kachick Feb 25, 2024
75f051d
Can we get the ref at here?
kachick Feb 25, 2024
dbfd350
Fix syntax
kachick Feb 25, 2024
0c76348
:<
kachick Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,29 @@ jobs:
matrix:
os:
- ubuntu-latest
- macos-latest
- macos-13 # Intel
target:
- tool-version: 'latest'
command: 'makers --version && cargo-make make --version'
# They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c
- tool-version: '0.36.7'
command: 'makers --version && cargo-make make --version'
# Supporting olderst
# https://github.com/kachick/asdf-cargo-make/blob/8a7095692e6a880568a5b48c441ea518ef6a61cb/bin/download#L12
# https://github.com/kachick/asdf-cargo-make/blob/8a7095692e6a880568a5b48c441ea518ef6a61cb/lib/utils.bash#L59-L61
- tool-version: '0.16.0'
# makers does not exist
command: 'cargo-make make --version'
include:
# They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c
- os: macos-14 # M1
target:
tool-version: 'latest'
command: 'makers --version && cargo-make make --version'
- os: macos-14 # M1
target:
tool-version: '0.36.7'
command: 'makers --version && cargo-make make --version'
runs-on: ${{ matrix.os }}
steps:
- uses: asdf-vm/actions/plugin-test@v3
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/ci-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,20 @@ on:
jobs:
tasks:
timeout-minutes: 10
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
# - macos-14 # M1 # asdf-typos does not support yet https://github.com/aschiavon91/asdf-typos/blob/98babb263fc77a9d9f2aaebb257899c29cb4c5d4/bin/download#L21
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aschiavon91/asdf-typos#15

- macos-13 # Intel
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: asdf-vm/actions/setup@v3
- run: |
asdf plugin-add cargo-make https://github.com/kachick/asdf-cargo-make.git
asdf plugin update cargo-make ${{ github.ref }} # https://github.com/asdf-vm/asdf/issues/1201
asdf install cargo-make
makers help
makers setup
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/mise.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
matrix:
os:
- ubuntu-latest
- macos-latest
- macos-13 # Intel
target:
- command: |
mise install cargo-make@latest
Expand All @@ -33,6 +33,20 @@ jobs:
mise install [email protected]
# makers does not exist
mise x [email protected] -- cargo-make make --version
include:
# They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c
- os: macos-14 # M1
target:
command: |
mise install cargo-make@latest
mise x cargo-make@latest -- makers --version
mise x cargo-make@latest -- cargo-make make --version
- os: macos-14 # M1
target:
command: |
mise install [email protected]
mise x cargo-make@latest -- makers --version
mise x cargo-make@latest -- cargo-make make --version
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 2 additions & 1 deletion lib/utils.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ download_release() {

case "$(uname -m)" in
x86_64*) architecture="x86_64" ;;
aarch64 | arm64) fail "Unsupported architecture for now. See https://github.com/sagiegurari/cargo-make/issues/738" ;;
# They are releasing aarch64 binary since 0.36.7: https://github.com/sagiegurari/cargo-make/commit/ab3cac2261c0ba67ab6d7a277aff8252faec0b1c
aarch64 | arm64) architecture="aarch64" ;;
*) fail "Unsupported architecture" ;;
esac

Expand Down