Skip to content

Commit 6c79cce

Browse files
authored
ci: macos-13 runners are deprecated (#568)
- use the minimum non-deprecated macOS runner to build - avoid cross-compilation because arrow-vendored jemalloc/mimalloc builds currently use the host architecture instead of the target - enable jemalloc/mimalloc for arm64 architectures - test against all stable free runner images
1 parent 23eb30f commit 6c79cce

File tree

3 files changed

+26
-15
lines changed

3 files changed

+26
-15
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,17 @@ jobs:
5252
if: github.event_name == 'schedule' || github.event_name == 'push' || github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id
5353
strategy:
5454
matrix:
55-
os: [ubuntu-22.04, macos-13, windows-2022]
56-
arch: [x64, arm64]
57-
exclude:
58-
- os: windows-2022
55+
include:
56+
- os: ubuntu-22.04-arm
57+
arch: arm64
58+
- os: ubuntu-22.04
59+
arch: x64
60+
- os: macos-14
5961
arch: arm64
62+
- os: macos-15-intel
63+
arch: x64
64+
- os: windows-2022
65+
arch: x64
6066
fail-fast: false
6167
name: Build native ${{ matrix.arch }} library (${{ matrix.os }})
6268
runs-on: ${{ matrix.os }}
@@ -231,11 +237,22 @@ jobs:
231237
test-nuget:
232238
strategy:
233239
matrix:
234-
os: [ubuntu-22.04, ubuntu-22.04-arm64, macos-13, macos-14, windows-2022]
240+
os:
241+
- ubuntu-22.04
242+
- ubuntu-22.04-arm
243+
- ubuntu-24.04
244+
- ubuntu-24.04-arm
245+
- macos-14
246+
- macos-15
247+
- macos-15-intel
248+
- windows-2022
249+
- windows-2025
235250
dotnet: [net6.0, net8.0, net9.0]
236251
include:
237252
- os: windows-2022
238253
dotnet: net472
254+
- os: windows-2025
255+
dotnet: net472
239256
fail-fast: false
240257
name: Test NuGet package (${{ matrix.dotnet }} on ${{ matrix.os }})
241258
runs-on: ${{ matrix.os }}

csharp.test/TestMemoryPool.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ public static void TestSystemMemoryPool()
2727
[Test]
2828
public static void TestJemallocMemoryPool()
2929
{
30-
var expectJemalloc = IsRunningInCi() &&
31-
(
32-
!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) &&
33-
RuntimeInformation.ProcessArchitecture != Architecture.Arm64);
30+
var expectJemalloc = IsRunningInCi() && !RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
3431
MemoryPool pool;
3532
try
3633
{
@@ -58,10 +55,7 @@ public static void TestJemallocMemoryPool()
5855
[Test]
5956
public static void TestMimallocMemoryPool()
6057
{
61-
var expectMimalloc = IsRunningInCi() &&
62-
(
63-
RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
64-
(!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture != Architecture.Arm64));
58+
var expectMimalloc = IsRunningInCi() && !RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
6559
MemoryPool pool;
6660
try
6761
{

vcpkg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"features": [
1010
{
1111
"name": "mimalloc",
12-
"platform": "linux | (!staticcrt & !arm64)"
12+
"platform": "linux | !staticcrt"
1313
},
1414
{
1515
"name": "jemalloc",
16-
"platform": "!windows&!arm64"
16+
"platform": "!windows"
1717
}
1818
]
1919
}

0 commit comments

Comments
 (0)