Skip to content

Commit 0a8fa7a

Browse files
authored
chore: update macos(x64) image to 26 and increase build timeout (#3109)
1 parent ff5848c commit 0a8fa7a

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/run-tests-selected.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
- macos-latest
1616
- windows-11-arm
1717
- ubuntu-24.04-arm
18-
- macos-15-intel
18+
- macos-26-intel
1919
project:
2020
type: choice
2121
description: Specify test project path

.github/workflows/run-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
os:
140140
- runs-on: 'macos-latest'
141141
arch: 'arm64'
142-
- runs-on: 'macos-15-intel'
142+
- runs-on: 'macos-26-intel'
143143
arch: 'x64'
144144
steps:
145145
- uses: actions/checkout@v6

docs/articles/contributing/running-tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Following parameters need to specified to invoke workflow with `gh workflow run`
5353

5454
| name | default | description
5555
|-------------------------------|------------------------------------------|---------------------
56-
| `runs_on` | `ubuntu-latest` | GitHub Actions runner image name (`windows-latest` `windows-11-arm` `ubuntu-latest` `macos-latest` `macos-15-intel`)
56+
| `runs_on` | `ubuntu-latest` | GitHub Actions runner image name (`windows-latest` `windows-11-arm` `ubuntu-latest` `macos-latest` `macos-26-intel`)
5757
| `project` | `tests/BenchmarkDotNet.IntegrationTests` | Specify path of project directory
5858
| `framework` | `net8.0` | Target Framework (e.g. `net8.0`, `net472`)
5959
| `filter` | `BenchmarkDotNet` | Test filter text (It's used for `dotnet test --filter`) Use default value when running all tests

tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ private IConfig CreateConfig(IToolchain toolchain,
417417
new EnvironmentVariable("COMPlus_TieredCompilation", "0")
418418
)
419419
: job)
420-
.WithBuildTimeout(TimeSpan.FromSeconds(240)) // Increase timeout for `MemoryDiagnoserSupportsModernMono` test on macos(x64)
420+
.WithBuildTimeout(TimeSpan.FromSeconds(480)) // Increase timeout for `MemoryDiagnoserSupportsModernMono` test on macos(x64)
421421
.AddColumnProvider(DefaultColumnProviders.Instance)
422422
.AddDiagnoser(MemoryDiagnoser.Default)
423423
.AddLogger(toolchain.IsInProcess ? ConsoleLogger.Default : new OutputLogger(output)); // we can't use OutputLogger for the InProcess toolchains because it allocates memory on the same thread

tests/BenchmarkDotNet.IntegrationTests/WasmTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private ManualConfig GetConfig(MonoAotCompilerMode aotCompilerMode, string javaS
8181
.AddJob(Job.Dry
8282
.WithRuntime(new WasmRuntime(dotnetVersion, RuntimeMoniker.WasmNet80, "wasm", aotCompilerMode == MonoAotCompilerMode.wasm, javaScriptEngine, mainJsTemplate: mainJsTemplate, ipcType: ipcType))
8383
.WithToolchain(WasmToolchain.From(netCoreAppSettings)))
84-
.WithBuildTimeout(TimeSpan.FromSeconds(240))
84+
.WithBuildTimeout(TimeSpan.FromSeconds(480)) // Increase timeout for `WasmSupportsInProcessDiagnosers` test on macos(x64)
8585
.WithOption(ConfigOptions.LogBuildOutput, true)
8686
.WithOption(ConfigOptions.GenerateMSBuildBinLog, false);
8787
}

0 commit comments

Comments
 (0)