Skip to content

Commit df383b8

Browse files
committed
(build) use macos-13 (amd64) and macos-14 (arm64)
1 parent 4abd2b9 commit df383b8

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.github/workflows/_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [windows-latest, ubuntu-latest, macos-latest]
14+
os: [windows-latest, ubuntu-latest, macos-13, macos-14]
1515

1616
runs-on: ${{ matrix.os }}
1717
steps:
@@ -44,7 +44,7 @@ jobs:
4444
-
4545
name: 'Upload native packages'
4646
uses: actions/upload-artifact@v4
47-
if: matrix.os != 'windows-latest'
47+
if: matrix.os != 'windows-latest' && matrix.os != 'macos-13'
4848
with:
4949
name: native-${{ runner.os }}
5050
path: ${{ github.workspace }}/artifacts/packages/native/*.tar.gz

.github/workflows/_prepare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
os: [windows-latest, ubuntu-latest, macos-latest]
10+
os: [windows-latest, ubuntu-latest, macos-13, macos-14]
1111

1212
runs-on: ${{ matrix.os }}
1313
steps:

.github/workflows/_unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [windows-latest, ubuntu-latest, macos-latest]
16+
os: [windows-latest, ubuntu-latest, macos-13, macos-14]
1717
targetFramework: [ 'net8.0', 'net7.0', 'net6.0' ]
1818

1919
runs-on: ${{ matrix.os }}

build/build/Tasks/Package/PackagePrepare.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@ private static void PackPrepareNative(BuildContext context)
3434

3535
// testing windows and macos artifacts, the linux is tested with docker
3636
if (platform == PlatformFamily.Linux) continue;
37-
if (runtime.EndsWith("arm64")) continue; // TODO: enable when we have arm64 macos agent
3837

39-
context.Information("Validating native lib:");
40-
var nativeExe = outputPath.CombineWithFilePath(context.IsOnWindows ? "gitversion.exe" : "gitversion");
41-
context.ValidateOutput(nativeExe.FullPath, "/showvariable FullSemver", context.Version?.GitVersion?.FullSemVer);
38+
if (context.IsRunningOnAmd64() && runtime.EndsWith("x64") || context.IsRunningOnArm64() && runtime.EndsWith("arm64"))
39+
{
40+
context.Information("Validating native lib:");
41+
var nativeExe = outputPath.CombineWithFilePath(context.IsOnWindows ? "gitversion.exe" : "gitversion");
42+
context.ValidateOutput(nativeExe.FullPath, "/showvariable FullSemver", context.Version?.GitVersion?.FullSemVer);
43+
}
4244
}
4345
}
4446

0 commit comments

Comments
 (0)