Skip to content

Commit

Permalink
Disable AppVeyor integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreyAkinshin
AndreyAkinshin committed Jul 7, 2023
1 parent cca0093 commit 28a1969
Show file tree
Hide file tree
Showing 15 changed files with 6 additions and 137 deletions.
1 change: 0 additions & 1 deletion README.md
View file
Expand Up @@ -289,7 +289,6 @@ You will avoid common pitfalls, control the accuracy of your measurements, and i
| Azure Pipelines | Windows | [![Azure Windows](https://dev.azure.com/dotnet/BenchmarkDotNet/_apis/build/status/BenchmarkDotNet%20-%20Windows)](https://dev.azure.com/dotnet/BenchmarkDotNet/_build/latest?definitionId=55) |
| Azure Pipelines | Ubuntu | [![Azure Ubuntu](https://dev.azure.com/dotnet/BenchmarkDotNet/_apis/build/status/BenchmarkDotNet%20-%20Ubuntu)](https://dev.azure.com/dotnet/BenchmarkDotNet/_build/latest?definitionId=56) |
| Azure Pipelines | macOS | [![Azure macOS](https://dev.azure.com/dotnet/BenchmarkDotNet/_apis/build/status/BenchmarkDotNet%20-%20macOS)](https://dev.azure.com/dotnet/BenchmarkDotNet/_build/latest?definitionId=57) |
| AppVeyor | Windows | [![AppVeyor/Windows](https://img.shields.io/appveyor/ci/dotnetfoundation/benchmarkdotnet/master.svg)](https://ci.appveyor.com/project/dotnetfoundation/benchmarkdotnet/branch/master) |
| GitHub Actions | * | [![GitHub Actions](https://github.com/dotnet/BenchmarkDotNet/actions/workflows/build.yaml/badge.svg)](https://github.com/dotnet/BenchmarkDotNet/actions/workflows/build.yaml) |

## Contributions are welcome!
Expand Down
46 changes: 0 additions & 46 deletions appveyor.yml
View file

This file was deleted.

12 changes: 1 addition & 11 deletions build/BenchmarkDotNet.Build/BuildContext.cs
View file
Expand Up @@ -7,7 +7,6 @@
using BenchmarkDotNet.Build.Runners;
using Cake.Common;
using Cake.Common.Build;
using Cake.Common.Build.AppVeyor;
using Cake.Common.Diagnostics;
using Cake.Common.IO;
using Cake.Common.Tools.DotNet;
Expand Down Expand Up @@ -38,16 +37,7 @@ public class BuildContext : FrostingContext
public DotNetMSBuildSettings MsBuildSettingsBuild { get; }
public DotNetMSBuildSettings MsBuildSettingsPack { get; }

private IAppVeyorProvider AppVeyor => this.BuildSystem().AppVeyor;
public bool IsRunningOnAppVeyor => AppVeyor.IsRunningOnAppVeyor;
public bool IsOnAppVeyorAndNotPr => IsRunningOnAppVeyor && !AppVeyor.Environment.PullRequest.IsPullRequest;

public bool IsOnAppVeyorAndBdnNightlyCiCd => IsOnAppVeyorAndNotPr &&
AppVeyor.Environment.Repository.Branch == "master" &&
this.IsRunningOnWindows();

public bool IsLocalBuild => this.BuildSystem().IsLocalBuild;
public bool IsCiBuild => !this.BuildSystem().IsLocalBuild;
private bool IsCiBuild => !this.BuildSystem().IsLocalBuild;

public VersionHistory VersionHistory { get; }

Expand Down
3 changes: 1 addition & 2 deletions build/BenchmarkDotNet.Build/Program.cs
View file
Expand Up @@ -43,8 +43,7 @@ public class UnitTestsTask : FrostingTask<BuildContext>
[IsDependentOn(typeof(BuildTask))]
public class InTestsFullTask : FrostingTask<BuildContext>
{
public override bool ShouldRun(BuildContext context) =>
context.IsRunningOnWindows() && !context.IsRunningOnAppVeyor;
public override bool ShouldRun(BuildContext context) => context.IsRunningOnWindows();

public override void Run(BuildContext context) => context.UnitTestRunner.RunInTests("net462");
}
Expand Down
5 changes: 2 additions & 3 deletions build/common.props
View file
Expand Up @@ -38,12 +38,11 @@

<PropertyGroup Condition=" '$(VersionPrefix)' == '' ">
<VersionPrefix>0.13.5</VersionPrefix>
<VersionPrefix Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(VersionPrefix).$(APPVEYOR_BUILD_NUMBER)</VersionPrefix>
</PropertyGroup>

<PropertyGroup Condition=" '$(VersionSuffix)' == '' AND '$(APPVEYOR_BUILD_NUMBER)' == '' ">
<PropertyGroup Condition=" '$(VersionSuffix)' == '' ">
<VersionSuffix>develop</VersionSuffix>
<VersionSuffix Condition=" '$(APPVEYOR_BUILD_NUMBER)' == '' AND '$(BDN_CI_BUILD)' != '' ">ci</VersionSuffix>
<VersionSuffix Condition=" '$(BDN_CI_BUILD)' != '' ">ci</VersionSuffix>
</PropertyGroup>

<PropertyGroup>
Expand Down
37 changes: 0 additions & 37 deletions build/uploadtests.ps1
View file

This file was deleted.

10 changes: 0 additions & 10 deletions docs/_changelog/header/v0.13.0.md
View file
Expand Up @@ -257,16 +257,6 @@ IConfig after = ManualConfig.CreateMinimumViable();

In [#1659](https://github.com/dotnet/BenchmarkDotNet/pull/1659/) [@workgroupengineering](https://github.com/workgroupengineering) added the possibility to indicate the source of the tested nuget package and whether it is a pre-release version.

```cs
IConfig config = DefaultConfig.Instance
.AddJob(Job.Default
.WithNuGet("BenchmarkDotNet", "0.13.0", new Uri("https://api.nuget.org/v3/index.json"))
.WithId("0.13.0"))
.AddJob(Job.Default
.WithNuGet("BenchmarkDotNet", "0.12.1.1534", new Uri("https://ci.appveyor.com/nuget/benchmarkdotnet"), prerelease: true)
.WithId("0.12.1.1534"));
```

### Deterministic benchmark builds

BenchmarkDotNet is now always enforcing Deterministic builds ([#1489](https://github.com/dotnet/BenchmarkDotNet/pull/1489)) and Optimizations enabled ([#1494](https://github.com/dotnet/BenchmarkDotNet/pull/1494)) which is a must-have if you are using custom build configurations. MSBuild enforces optimizations **only** for configurations that are named `Release` (the comparison is case-insensitive).
Expand Down
3 changes: 0 additions & 3 deletions tests/BenchmarkDotNet.IntegrationTests/BenchmarkSwitcherTest.cs
View file
Expand Up @@ -289,9 +289,6 @@ public void WhenJobIsDefinedViaAttributeAndArgumentsDontContainJobArgumentOnlySi
[Fact]
public void JobNotDefinedButStillBenchmarkIsExecuted()
{
if (ContinuousIntegration.IsAppVeyorOnWindows())
return; // timeouts

var types = new[] { typeof(JustBenchmark) };
var switcher = new BenchmarkSwitcher(types);
MockExporter mockExporter = new MockExporter();
Expand Down
7 changes: 1 addition & 6 deletions tests/BenchmarkDotNet.IntegrationTests/ContinuousIntegration.cs
View file
Expand Up @@ -7,14 +7,9 @@ internal static class ContinuousIntegration
{
private static bool IsGitHubActions() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTION"));

private static bool IsAppVeyor() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPVEYOR"));

internal static bool IsGitHubActionsOnWindows()
=> RuntimeInformation.IsWindows() && IsGitHubActions();

internal static bool IsAppVeyorOnWindows()
=> RuntimeInformation.IsWindows() && IsAppVeyor();

internal static bool IsLocalRun() => !IsGitHubActions() && !IsAppVeyor();
internal static bool IsLocalRun() => !IsGitHubActions();
}
}
3 changes: 0 additions & 3 deletions tests/BenchmarkDotNet.IntegrationTests/CustomBuildConfigurationTests.cs
View file
Expand Up @@ -18,9 +18,6 @@ public CustomBuildConfigurationTests(ITestOutputHelper output) : base(output)
[Fact]
public void UserCanSpecifyCustomBuildConfiguration()
{
if (ContinuousIntegration.IsAppVeyorOnWindows())
return; // timeouts

var jobWithCustomConfiguration = Job.Dry.WithCustomBuildConfiguration("CUSTOM");

var config = CreateSimpleConfig(job: jobWithCustomConfiguration);
Expand Down
5 changes: 0 additions & 5 deletions tests/BenchmarkDotNet.IntegrationTests/MemoryDiagnoserTests.cs
View file
Expand Up @@ -75,8 +75,6 @@ public void MemoryDiagnoserSupportsNativeAOT()
{
if (RuntimeInformation.IsMacOS())
return; // currently not supported
if (ContinuousIntegration.IsAppVeyorOnWindows())
return; // timeouts

MemoryDiagnoserIsAccurate(
NativeAotToolchain.CreateBuilder()
Expand All @@ -87,9 +85,6 @@ public void MemoryDiagnoserSupportsNativeAOT()
[FactDotNetCoreOnly("We don't want to test MonoVM twice (for .NET Framework 4.6.2 and .NET 7.0)")]
public void MemoryDiagnoserSupportsModernMono()
{
if (ContinuousIntegration.IsAppVeyorOnWindows())
return; // timeouts

MemoryDiagnoserIsAccurate(MonoToolchain.Mono70);
}

Expand Down
3 changes: 0 additions & 3 deletions tests/BenchmarkDotNet.IntegrationTests/MonoTests.cs
View file
Expand Up @@ -13,9 +13,6 @@ public class MonoTests : BenchmarkTestExecutor
[FactDotNetCoreOnly("UseMonoRuntime option is available in .NET Core only starting from .NET 6")]
public void Mono70IsSupported()
{
if (ContinuousIntegration.IsAppVeyorOnWindows())
return; // timeouts

var config = ManualConfig.CreateEmpty().AddJob(Job.Dry.WithRuntime(MonoRuntime.Mono70));
CanExecute<MonoBenchmark>(config);
}
Expand Down
2 changes: 0 additions & 2 deletions tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs
View file
Expand Up @@ -22,8 +22,6 @@ public void LatestNativeAotVersionIsSupported()
return;
if (ContinuousIntegration.IsGitHubActionsOnWindows()) // no native dependencies installed
return;
if (ContinuousIntegration.IsAppVeyorOnWindows())
return; // timeouts
if (RuntimeInformation.IsMacOS())
return; // currently not supported

Expand Down
3 changes: 0 additions & 3 deletions tests/BenchmarkDotNet.IntegrationTests/RunStrategyTests.cs
View file
Expand Up @@ -19,9 +19,6 @@ public class RunStrategyTests : BenchmarkTestExecutor
[Fact]
public void RunStrategiesAreSupported()
{
if (ContinuousIntegration.IsAppVeyorOnWindows())
return; // timeouts

var config = ManualConfig.CreateEmpty()
.AddColumnProvider(DefaultColumnProviders.Instance)
.AddLogger(new OutputLogger(Output))
Expand Down
3 changes: 1 addition & 2 deletions tests/BenchmarkDotNet.IntegrationTests/ThreadingDiagnoserTests.cs
View file
Expand Up @@ -32,8 +32,7 @@ public static IEnumerable<object[]> GetToolchains()
yield return new object[] { Job.Default.GetToolchain() };

if (!ContinuousIntegration.IsGitHubActionsOnWindows() // no native dependencies
&& !RuntimeInformation.IsMacOS() // currently not supported
&& !ContinuousIntegration.IsAppVeyorOnWindows()) // timeouts
&& !RuntimeInformation.IsMacOS()) // currently not supported
{
yield return new object[]{ NativeAotToolchain.CreateBuilder()
.UseNuGet("7.0.0", "https://api.nuget.org/v3/index.json")
Expand Down

0 comments on commit 28a1969

Please sign in to comment.