Fixes CI build

aivascu · Jul 19, 2020 · 4dc411c · 4dc411c
1 parent 8519bf3
commit 4dc411c
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 86 deletions.
diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml
@@ -20,39 +20,8 @@ on:
   push:
     branches:
       - master
-    paths:
-      - !**.md
-      - !license
 
 jobs:
-  macOS-latest:
-    name: macOS-latest
-    runs-on: macOS-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Run './build.cmd Test'
-        run: ./build.cmd Test
-        env:
-            GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-            CoverallsToken: ${{ secrets.CoverallsToken }}
-      - uses: actions/upload-artifact@v1
-        with:
-          name: testresults
-          path: testresults
-  ubuntu-latest:
-    name: ubuntu-latest
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Run './build.cmd Test'
-        run: ./build.cmd Test
-        env:
-            GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-            CoverallsToken: ${{ secrets.CoverallsToken }}
-      - uses: actions/upload-artifact@v1
-        with:
-          name: testresults
-          path: testresults
   windows-latest:
     name: windows-latest
     runs-on: windows-latest

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -21,39 +21,8 @@ on:
     branches:
       - master
       - develop
-    paths:
-      - !**.md
-      - !license
 
 jobs:
-  macOS-latest:
-    name: macOS-latest
-    runs-on: macOS-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Run './build.cmd Test'
-        run: ./build.cmd Test
-        env:
-            GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-            CoverallsToken: ${{ secrets.CoverallsToken }}
-      - uses: actions/upload-artifact@v1
-        with:
-          name: testresults
-          path: testresults
-  ubuntu-latest:
-    name: ubuntu-latest
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - name: Run './build.cmd Test'
-        run: ./build.cmd Test
-        env:
-            GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-            CoverallsToken: ${{ secrets.CoverallsToken }}
-      - uses: actions/upload-artifact@v1
-        with:
-          name: testresults
-          path: testresults
   windows-latest:
     name: windows-latest
     runs-on: windows-latest

diff --git a/build/Build.Coveralls.cs b/build/Build.Coveralls.cs
@@ -10,7 +10,7 @@
 
 partial class Build
 {
-    [Parameter] readonly string CoverallsToken;
+    [Parameter("Coveralls.io repo token")] readonly string CoverallsToken;
 
     private Target PublishCoverage => _ => _
         .DependsOn(Cover)
@@ -31,7 +31,7 @@ partial class Build
                 .SetCommitMessage(commit.Message));
         });
 
-    private CommitInfo GetLastCommit() => new[] {RootDirectory / ".git"}
+    private CommitInfo GetLastCommit() => new[] { RootDirectory / ".git" }
         .SelectMany(x => Git(
             @"log -1 --pretty=""%H|%an|%ae|%s""",
             workingDirectory: RootDirectory,

diff --git a/build/Build.GitHub.cs b/build/Build.GitHub.cs
@@ -7,9 +7,10 @@
 
 internal partial class Build
 {
-    [Parameter] private readonly string GitHubToken;
+    [Parameter("GitHub auth token")] private readonly string GitHubToken;
 
     Target DraftRelease => _ => _
+        .DependsOn(Publish)
         .Requires(() => GitRepository.IsGitHubRepository())
         .Executes(() =>
         {

diff --git a/build/Build.cs b/build/Build.cs
@@ -23,24 +23,19 @@
 
 [CheckBuildProjectConfigurations]
 [UnsetVisualStudioEnvironmentVariables]
+[DotNetVerbosityMapping]
 [GitHubActions("pull_request",
-    GitHubActionsImage.MacOsLatest,
-    GitHubActionsImage.UbuntuLatest,
     GitHubActionsImage.WindowsLatest,
-    OnPullRequestBranches = new[] {MasterBranch, DevelopBranch},
-    OnPullRequestExcludePaths = new [] {"**.md", "license"},
-    InvokedTargets = new[] {nameof(Test)},
+    OnPullRequestBranches = new[] { MasterBranch, DevelopBranch },
+    InvokedTargets = new[] { nameof(Test) },
     ImportGitHubTokenAs = nameof(GitHubToken),
-    ImportSecrets = new [] {nameof(CoverallsToken)})]
-[GitHubActions("continuous", 
-    GitHubActionsImage.MacOsLatest,
-    GitHubActionsImage.UbuntuLatest,
+    ImportSecrets = new[] { nameof(CoverallsToken) })]
+[GitHubActions("continuous",
     GitHubActionsImage.WindowsLatest,
-    OnPushBranches = new []{MasterBranch},
-    OnPushExcludePaths = new [] {"**.md", "license"},
-    InvokedTargets = new []{nameof(Test)},
+    OnPushBranches = new[] { MasterBranch },
+    InvokedTargets = new[] { nameof(Test) },
     ImportGitHubTokenAs = nameof(GitHubToken),
-    ImportSecrets = new [] {nameof(CoverallsToken)})]
+    ImportSecrets = new[] { nameof(CoverallsToken) })]
 internal partial class Build : NukeBuild
 {
     /// Support plugins are available for:
@@ -71,7 +66,7 @@ internal partial class Build : NukeBuild
 
     [Partition(2)] private readonly Partition TestPartition;
 
-    private readonly IEnumerable<string> NonLibProjects = new[] {"_build", "TestClasses"};
+    private readonly IEnumerable<string> NonLibProjects = new[] { "_build", "TestClasses" };
 
     private IEnumerable<Project> TestProjects => TestPartition.GetCurrent(Solution.GetProjects("*.Tests"));
 
@@ -154,10 +149,9 @@ internal partial class Build : NukeBuild
                 .SetFramework("netcoreapp3.0")
                 .SetReports(TestResultsDirectory / "*.xml")
                 .SetTargetDirectory(CoverageDirectory)
+                .SetReportTypes((ReportTypes)"lcov")
                 .When(IsLocalBuild, _ => _
-                    .SetReportTypes(ReportTypes.HtmlInline))
-                .When(IsServerBuild, _ => _
-                    .SetReportTypes((ReportTypes)"lcov")));
+                    .AddReportTypes(ReportTypes.HtmlInline)));
         });
 
     private Target Pack => _ => _
@@ -178,7 +172,7 @@ internal partial class Build : NukeBuild
 
     private Target Publish => _ => _
         .ProceedAfterFailure()
-        .DependsOn(Clean, Test, Pack)
+        .DependsOn(Test, Pack)
         .Consumes(Pack)
         .Requires(() => NuGetApiKey)
         .Requires(() => GitHasCleanWorkingCopy())

diff --git a/tests/AutoFixture.Community.AutoEF.Core.Tests/AutoFixture.Community.AutoEF.Core.Tests.csproj b/tests/AutoFixture.Community.AutoEF.Core.Tests/AutoFixture.Community.AutoEF.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/...ixture.Community.AutoEF.InMemory.Tests/AutoFixture.Community.AutoEF.InMemory.Tests.csproj b/...ixture.Community.AutoEF.InMemory.Tests/AutoFixture.Community.AutoEF.InMemory.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/...utoFixture.Community.AutoEF.SQLite.Tests/AutoFixture.Community.AutoEF.SQLite.Tests.csproj b/...utoFixture.Community.AutoEF.SQLite.Tests/AutoFixture.Community.AutoEF.SQLite.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>