Skip to content

Commit

Permalink
Add M1 build to the build/release matrix (#103)
Browse files Browse the repository at this point in the history
* Add M1 build to the release matrix

* lso add to CI

* Name the build step

* Add concurrency to the CI build
  • Loading branch information
skeet70 authored Jun 14, 2023
1 parent d1a09a4 commit 68e84ae
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
name: ci
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
on:
pull_request:
push:
Expand Down Expand Up @@ -31,6 +34,7 @@ jobs:
- beta
- nightly
- macos
- macos-arm64
- win-msvc
- win-gnu
include:
Expand Down Expand Up @@ -58,6 +62,9 @@ jobs:
rust: nightly
- build: macos
os: macos-12
- build: macos-arm64
os: [self-hosted, macOS, ARM64]
target: aarch64-apple-darwin
- build: win-msvc
os: windows-2022
- build: win-gnu
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
RUST_BACKTRACE: 1
strategy:
matrix:
build: [linux, linux-arm64, linux-arm, macos, win-msvc, win-gnu]
build: [linux, linux-arm64, linux-arm, macos, macos-arm64, win-msvc, win-gnu]
include:
- build: linux
os: ubuntu-22.04
Expand All @@ -81,6 +81,9 @@ jobs:
- build: macos
os: macos-12
target: x86_64-apple-darwin
- build: macos-arm64
os: [self-hosted, macOS, ARM64]
target: aarch64-apple-darwin
- build: win-msvc
os: windows-2022
target: x86_64-pc-windows-msvc
Expand Down Expand Up @@ -127,7 +130,7 @@ jobs:
run: ${{ env.CARGO }} build --verbose --release ${{ env.TARGET_FLAGS }}

- name: Strip release binary (linux and mac)
if: matrix.build == 'linux' || matrix.build == 'macos'
if: matrix.build == 'linux' || matrix.build == 'macos' || matrix.build == 'macos-arm64'
run: strip "target/${{ matrix.target }}/release/ironhide"

- name: Strip release binary (arm)
Expand Down

0 comments on commit 68e84ae

Please sign in to comment.