Skip to content

Commit 65bd4d1

Browse files
committed
ci: Add MacOS ARM support (#451)
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.
1 parent 1fe517d commit 65bd4d1

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.github/workflows/ci.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ jobs:
1616
os:
1717
- windows-latest
1818
- ubuntu-latest
19-
- macos-latest
19+
- macos-12
20+
- macos-14
21+
include:
22+
- arch: x64
23+
- arch: ARM64
24+
os: macos-14
2025
runs-on: ${{ matrix.os }}
2126
steps:
2227
- uses: actions/checkout@v3
@@ -36,7 +41,7 @@ jobs:
3641
run: dotnet build --no-restore
3742

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

4146
- name: Pack
4247
if: matrix.os == 'windows-latest'

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Due to using a shared native library instead of C# for the main Pact logic only
241241
| Linux (libc) | x64 | ✔️ Yes |
242242
| Linux (musl) | Any |[No](https://github.com/pact-foundation/pact-net/issues/374) |
243243
| OSX | x64 | ✔️ Yes |
244-
| OSX | ARM (M1/M2) | ⚠️ [Alpha](https://github.com/pact-foundation/pact-net/issues/451) |
244+
| OSX | ARM (M1/M2) | ✔️ Yes |
245245

246246
### Pact Specification
247247

docs/upgrading-to-5.md

+5
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,8 @@ Minimum Supported .Net Framework Version
127127

128128
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
129129
`System.Text.Json`.
130+
131+
MacOS ARM64 Full Support
132+
------------------------
133+
134+
MacOS now has full x86-64 and ARM support.

0 commit comments

Comments
 (0)