Skip to content

Commit

Permalink
ci: Add MacOS ARM support (#451)
Browse files Browse the repository at this point in the history
The target platform is explicitly noted so that the CI will flag up
if/when GitHub runners change their defaults. This ensures we're very
explicitly doing both an x64 and ARM build for MacOS instead of
accidentally doing only ARM if/when the defaults are changed.
  • Loading branch information
adamrodger committed Feb 15, 2024
1 parent 1fe517d commit 65bd4d1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ jobs:
os:
- windows-latest
- ubuntu-latest
- macos-latest
- macos-12
- macos-14
include:
- arch: x64
- arch: ARM64
os: macos-14
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand All @@ -36,7 +41,7 @@ jobs:
run: dotnet build --no-restore

- name: Test
run: dotnet test --no-build --verbosity normal -- RunConfiguration.TargetPlatform=x64
run: dotnet test --no-build --verbosity normal -- RunConfiguration.TargetPlatform=${{matrix.arch}}

- name: Pack
if: matrix.os == 'windows-latest'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ Due to using a shared native library instead of C# for the main Pact logic only
| Linux (libc) | x64 | ✔️ Yes |
| Linux (musl) | Any |[No](https://github.com/pact-foundation/pact-net/issues/374) |
| OSX | x64 | ✔️ Yes |
| OSX | ARM (M1/M2) | ⚠️ [Alpha](https://github.com/pact-foundation/pact-net/issues/451) |
| OSX | ARM (M1/M2) | ✔️ Yes |

### Pact Specification

Expand Down
5 changes: 5 additions & 0 deletions docs/upgrading-to-5.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,8 @@ Minimum Supported .Net Framework Version

The minimum supported version of .Net Framework is now 4.6.2 instead of 4.6.1 in line with the minimum supported version in
`System.Text.Json`.

MacOS ARM64 Full Support
------------------------

MacOS now has full x86-64 and ARM support.

0 comments on commit 65bd4d1

Please sign in to comment.