Skip to content

chore: Modify macos runner image for CI #2775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timcassell merged 3 commits into from
Jun 14, 2025
Merged

chore: Modify macos runner image for CI #2775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9384c6c
chore: modify runner image for macos
filzrev Jun 13, 2025
e5becfc
chore: fix workflow name and artifact name
filzrev Jun 13, 2025
954ea05
Update .github/workflows/run-tests.yaml
timcassell Jun 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .github/workflows/run-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,25 @@ jobs:
path: "**/*.trx"

test-macos:
runs-on: macos-15
name: test-macos (${{ matrix.os.arch }})
runs-on: ${{ matrix.os.runs-on }}
strategy:
matrix:
os:
- runs-on: 'macos-latest'
jsvu-os: 'mac64arm'
arch: 'arm64'
- runs-on: 'macos-13'
jsvu-os: 'mac64'
arch: 'x64'
steps:
- uses: actions/checkout@v4
- name: Set up node
uses: actions/setup-node@v4
with:
node-version: "22"
- name: Set up v8
run: npm install jsvu -g && jsvu --os=mac64 --engines=v8 && echo "$HOME/.jsvu/bin" >> $GITHUB_PATH
run: npm install jsvu -g && jsvu --os=${{ matrix.os.jsvu-os }} --engines=v8 && echo "$HOME/.jsvu/bin" >> $GITHUB_PATH
- name: Install wasm-tools workload
run: ./build.cmd install-wasm-tools
# Build and Test
Expand All @@ -114,7 +124,7 @@ jobs:
uses: actions/upload-artifact@v4
if: always()
with:
name: test-macos-trx-${{ github.run_id }}
name: test-macos(${{ matrix.os.arch }})-trx-${{ github.run_id }}
path: "**/*.trx"

test-pack:
Expand Down
4 changes: 3 additions & 1 deletion build/BenchmarkDotNet.Build/Runners/UnitTestRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Cake.Common.Tools.DotNet;
using Cake.Common.Tools.DotNet.Test;
using Cake.Core.IO;
using System.Runtime.InteropServices;

namespace BenchmarkDotNet.Build.Runners;

Expand Down Expand Up @@ -47,7 +48,8 @@ private DotNetTestSettings GetTestSettingsParameters(FilePath logFile, string tf
private void RunTests(FilePath projectFile, string alias, string tfm)
{
var os = Utils.GetOs();
var trxFileName = $"{os}-{alias}-{tfm}.trx";
var arch = RuntimeInformation.OSArchitecture.ToString().ToLower();
var trxFileName = $"{os}({arch})-{alias}-{tfm}.trx";
var trxFile = TestOutputDirectory.CombineWithFilePath(trxFileName);
var settings = GetTestSettingsParameters(trxFile, tfm);

Expand Down