Skip to content

Commit a0035f9

Browse files
authored
re-enable NativeAOT tests on GitHub Actions Windows (#1988)
* call vcvars64.bat to add native tools required by NativeAOT to $path * re-enable NativeAOT tests
1 parent 554127b commit a0035f9

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v2
1212
- name: Run
13-
run: ./build.ps1
13+
shell: cmd
14+
run: |
15+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
16+
./build.bat
1417
build-linux:
1518
runs-on: ubuntu-latest
1619
steps:

tests/BenchmarkDotNet.IntegrationTests/BuildTimeoutTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ public void WhenBuildTakesMoreTimeThanTheTimeoutTheBuildIsCancelled()
1919
{
2020
if (!RuntimeInformation.Is64BitPlatform()) // NativeAOT does not support 32bit yet
2121
return;
22-
if (ContinuousIntegration.IsGitHubActionsOnWindows()) // no native dependencies installed
23-
return;
2422

2523
// we use NativeAOT on purpose because it takes a LOT of time to build it
2624
// so we can be sure that timeout = 1s should fail!

tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ public void MemoryDiagnoserIsAccurate(IToolchain toolchain)
6767
[FactDotNetCoreOnly("We don't want to test NativeAOT twice (for .NET Framework 4.6.1 and .NET 6.0)")]
6868
public void MemoryDiagnoserSupportsNativeAOT()
6969
{
70-
if (ContinuousIntegration.IsGitHubActionsOnWindows())
71-
return;
72-
7370
MemoryDiagnoserIsAccurate(
7471
NativeAotToolchain.CreateBuilder()
7572
.UseNuGet(

0 commit comments

Comments
 (0)