Merge pull request #1414 from lahma/nuke-8.1

Upgrade to NUKE 8.1
nissl-lab · Sep 10, 2024 · 5055a11 · 5055a11
2 parents 384f899 + ed13051
commit 5055a11
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 85 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -30,11 +30,12 @@ jobs:
     runs-on: windows-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: 'Run: Clean, Test, Pack'
         run: ./build.cmd Clean Test Pack
       - name: 'Publish: publish'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        if: runner.os == 'Windows'
         with:
           name: publish
           path: publish
@@ -43,11 +44,12 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: 'Run: Clean, Test, Pack'
         run: ./build.cmd Clean Test Pack
       - name: 'Publish: publish'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        if: runner.os == 'Windows'
         with:
           name: publish
           path: publish
diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -18,17 +18,22 @@ name: PR
 
 on: [pull_request]
 
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   windows-latest:
     name: windows-latest
     runs-on: windows-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: 'Run: Clean, Test, Pack'
         run: ./build.cmd Clean Test Pack
       - name: 'Publish: publish'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        if: runner.os == 'Windows'
         with:
           name: publish
           path: publish
@@ -37,11 +42,12 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: 'Run: Clean, Test, Pack'
         run: ./build.cmd Clean Test Pack
       - name: 'Publish: publish'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
+        if: runner.os == 'Windows'
         with:
           name: publish
           path: publish
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -1,52 +1,79 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "$ref": "#/definitions/build",
-  "title": "Build Schema",
+  "properties": {
+    "Configuration": {
+      "type": "string",
+      "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
+      "enum": [
+        "Debug",
+        "Release"
+      ]
+    },
+    "GitHubToken": {
+      "type": "string",
+      "description": "GitHub API token",
+      "default": "Secrets must be entered via 'nuke :secrets [profile]'"
+    },
+    "Solution": {
+      "type": "string",
+      "description": "Path to a solution file that is automatically loaded"
+    }
+  },
   "definitions": {
-    "build": {
-      "type": "object",
+    "Host": {
+      "type": "string",
+      "enum": [
+        "AppVeyor",
+        "AzurePipelines",
+        "Bamboo",
+        "Bitbucket",
+        "Bitrise",
+        "GitHubActions",
+        "GitLab",
+        "Jenkins",
+        "Rider",
+        "SpaceAutomation",
+        "TeamCity",
+        "Terminal",
+        "TravisCI",
+        "VisualStudio",
+        "VSCode"
+      ]
+    },
+    "ExecutableTarget": {
+      "type": "string",
+      "enum": [
+        "Clean",
+        "Compile",
+        "InstallFonts",
+        "Pack",
+        "Restore",
+        "Test"
+      ]
+    },
+    "Verbosity": {
+      "type": "string",
+      "description": "",
+      "enum": [
+        "Verbose",
+        "Normal",
+        "Minimal",
+        "Quiet"
+      ]
+    },
+    "NukeBuild": {
       "properties": {
-        "Configuration": {
-          "type": "string",
-          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
-          "enum": [
-            "Debug",
-            "Release"
-          ]
-        },
         "Continue": {
           "type": "boolean",
           "description": "Indicates to continue a previously failed build attempt"
         },
-        "GitHubToken": {
-          "type": "string",
-          "description": "GitHub API token",
-          "default": "Secrets must be entered via 'nuke :secrets [profile]'"
-        },
         "Help": {
           "type": "boolean",
           "description": "Shows the help text for this build assembly"
         },
         "Host": {
-          "type": "string",
           "description": "Host for execution. Default is 'automatic'",
-          "enum": [
-            "AppVeyor",
-            "AzurePipelines",
-            "Bamboo",
-            "Bitbucket",
-            "Bitrise",
-            "GitHubActions",
-            "GitLab",
-            "Jenkins",
-            "Rider",
-            "SpaceAutomation",
-            "TeamCity",
-            "Terminal",
-            "TravisCI",
-            "VisualStudio",
-            "VSCode"
-          ]
+          "$ref": "#/definitions/Host"
         },
         "NoLogo": {
           "type": "boolean",
@@ -75,47 +102,22 @@
           "type": "array",
           "description": "List of targets to be skipped. Empty list skips all dependencies",
           "items": {
-            "type": "string",
-            "enum": [
-              "Clean",
-              "Compile",
-              "InstallFonts",
-              "Pack",
-              "Restore",
-              "Test"
-            ]
+            "$ref": "#/definitions/ExecutableTarget"
           }
         },
-        "Solution": {
-          "type": "string",
-          "description": "Path to a solution file that is automatically loaded"
-        },
         "Target": {
           "type": "array",
           "description": "List of targets to be invoked. Default is '{default_target}'",
           "items": {
-            "type": "string",
-            "enum": [
-              "Clean",
-              "Compile",
-              "InstallFonts",
-              "Pack",
-              "Restore",
-              "Test"
-            ]
+            "$ref": "#/definitions/ExecutableTarget"
           }
         },
         "Verbosity": {
-          "type": "string",
           "description": "Logging verbosity during build execution. Default is 'Normal'",
-          "enum": [
-            "Minimal",
-            "Normal",
-            "Quiet",
-            "Verbose"
-          ]
+          "$ref": "#/definitions/Verbosity"
         }
       }
     }
-  }
+  },
+  "$ref": "#/definitions/NukeBuild"
 }
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -16,7 +16,6 @@
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="NuGetizer" Version="1.1.0" />
-    <PackageVersion Include="Nuke.Common" Version="8.0.0" />
     <PackageVersion Include="NUnit" Version="3.14.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />

diff --git a/build/Build.GitHubAction.cs b/build/Build.GitHubAction.cs
@@ -3,20 +3,21 @@
 [GitHubActions("CI",
     GitHubActionsImage.WindowsLatest,
     GitHubActionsImage.UbuntuLatest,
-    OnPushBranches = new[] { "main", "master", "release*", "poi/*" },
-    InvokedTargets = new[] { nameof(Clean), nameof(Test), nameof(Pack) },
+    OnPushBranches = ["main", "master", "release*", "poi/*"],
+    InvokedTargets = [nameof(Clean), nameof(Test), nameof(Pack)],
     TimeoutMinutes = 20,
-    CacheKeyFiles = new string[0]
+    CacheKeyFiles = [],
+    PublishCondition = "runner.os == 'Windows'"
 )]
 [GitHubActions("PR",
     GitHubActionsImage.WindowsLatest,
     GitHubActionsImage.UbuntuLatest,
-    On = new [] { GitHubActionsTrigger.PullRequest },
-    InvokedTargets = new[] { nameof(Clean), nameof(Test), nameof(Pack) },
+    On = [GitHubActionsTrigger.PullRequest],
+    InvokedTargets = [nameof(Clean), nameof(Test), nameof(Pack)],
     TimeoutMinutes = 20,
-    CacheKeyFiles = new string[0]
+    CacheKeyFiles = [],
+    ConcurrencyCancelInProgress = true,
+    PublishCondition = "runner.os == 'Windows'"
 )]
-partial class Build
-{
-}
+partial class Build;
 
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -4,15 +4,15 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
         <RootNamespace></RootNamespace>
-        <NoWarn>CS0649;CS0169</NoWarn>
+        <NoWarn>$(NoWarn);CS0649;CS0169;NU1903</NoWarn>
         <NukeRootDirectory>..</NukeRootDirectory>
         <NukeScriptDirectory>..</NukeScriptDirectory>
         <NukeTelemetryVersion>1</NukeTelemetryVersion>
         <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Nuke.Common" Version="8.0.0" />
+        <PackageReference Include="Nuke.Common" Version="8.1.0" />
     </ItemGroup>
 
 </Project>