From 83271e85b9e38598b0c1845829a7436263a741e6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 May 2025 01:15:27 +0000 Subject: [PATCH 1/2] Update nuke --- directory.packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/directory.packages.props b/directory.packages.props index 7d34be0ea..6140377c4 100644 --- a/directory.packages.props +++ b/directory.packages.props @@ -18,9 +18,9 @@ - + - + From 18c78f25e9b8937777a3c8a9dcf417312ad395b1 Mon Sep 17 00:00:00 2001 From: rlittlesii <6969701+RLittlesII@users.noreply.github.com> Date: Tue, 8 Jul 2025 08:51:30 -0500 Subject: [PATCH 2/2] renovate: renovate: lets see if this works --- .build/AirframeBuild.GitHubActions.cs | 5 - .github/workflows/ci.yml | 14 +- .nuke/build.schema.json | 222 ++++++++++++-------------- 3 files changed, 110 insertions(+), 131 deletions(-) diff --git a/.build/AirframeBuild.GitHubActions.cs b/.build/AirframeBuild.GitHubActions.cs index b7fd7465c..5d4242ef6 100644 --- a/.build/AirframeBuild.GitHubActions.cs +++ b/.build/AirframeBuild.GitHubActions.cs @@ -38,17 +38,12 @@ public partial class AirframeBuild { public Target GitHubActions => definition => definition .OnlyWhenStatic(IsRunningOnGitHubActions) - .DependsOn(Workloads) .DependsOn(Restore) .DependsOn(Build) .DependsOn(Test) .DependsOn(Pack) .Executes(); - public Target Workloads => definition => definition - .Before(Restore) - .Executes(() => DotNetTasks.DotNetWorkloadInstall(configurator => configurator.AddWorkloadId("ios"))); - public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGitHubActionsConfiguration configuration) { var buildJob = configuration.Jobs.Cast().First(z => z.Name.Equals("build", StringComparison.OrdinalIgnoreCase)); diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ceec02b09..b7d30cc8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,18 +59,18 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.101' - - name: 🎁 dotnet tool restore + - name: 🚒 dotnet workload restore + continue-on-error: true run: | - dotnet tool restore - - name: Workloads - id: workloads + dotnet workload restore + - name: ⚒️ dotnet tool restore run: | - dotnet nuke Workloads --skip + dotnet tool restore - name: 🎁 Restore id: restore run: | dotnet nuke Restore --skip - - name: ⚙ Build + - name: ⚙️ Build id: build run: | dotnet nuke Build --skip @@ -86,7 +86,7 @@ jobs: id: gitHubActions run: | dotnet nuke GitHubActions --skip - - name: 🐿 Publish Coverage + - name: 📫 Publish Coverage uses: codecov/codecov-action@v3.1.4 with: name: 'actions-${{ matrix.os }}' diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 690774d53..24cec70d7 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -1,62 +1,82 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/build", - "title": "Build Schema", "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": [ + "Build", + "Clean", + "CoreBuild", + "CorePack", + "CoreRestore", + "CoreTest", + "Default", + "DotNetFormat", + "DotnetToolRestore", + "GenerateCodeCoverageBadges", + "GenerateCodeCoverageReport", + "GenerateCodeCoverageReportCobertura", + "GenerateCodeCoverageSummary", + "GenerateReadme", + "GitHubActions", + "JetBrainsCleanupCode", + "Lint", + "LintGitAdd", + "LintPublicApiAnalyzers", + "LintStaged", + "MoveUnshippedToShipped", + "Pack", + "PostLint", + "RegenerateBuildConfigurations", + "Restore", + "ShipPublicApis", + "Test", + "TriggerCodeCoverageReports" + ] + }, + "Verbosity": { + "type": "string", + "description": "", + "enum": [ + "Verbose", + "Normal", + "Minimal", + "Quiet" + ] + }, + "NukeBuild": { "properties": { - "Artifacts": { - "type": "string", - "description": "The directory where artifacts are to be dropped" - }, - "Configuration": { - "type": "string", - "description": "Configuration to build", - "enum": [ - "Debug", - "Release" - ] - }, "Continue": { "type": "boolean", "description": "Indicates to continue a previously failed build attempt" }, - "Coverage": { - "type": "string", - "description": "The directory where coverage artifacts are to be dropped" - }, "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" - ] - }, - "lint-files": { - "type": "array", - "description": "The files to lint, if not given lints all files", - "items": { - "type": "string" - } + "$ref": "#/definitions/Host" }, "NoLogo": { "type": "boolean", @@ -85,93 +105,57 @@ "type": "array", "description": "List of targets to be skipped. Empty list skips all dependencies", "items": { - "type": "string", - "enum": [ - "Build", - "Clean", - "CoreBuild", - "CorePack", - "CoreRestore", - "CoreTest", - "Default", - "DotNetFormat", - "DotnetToolRestore", - "GenerateCodeCoverageBadges", - "GenerateCodeCoverageReport", - "GenerateCodeCoverageReportCobertura", - "GenerateCodeCoverageSummary", - "GenerateReadme", - "GitHubActions", - "JetBrainsCleanupCode", - "Lint", - "LintGitAdd", - "LintPublicApiAnalyzers", - "LintStaged", - "MoveUnshippedToShipped", - "Pack", - "PostLint", - "RegenerateBuildConfigurations", - "Restore", - "ShipPublicApis", - "Test", - "TriggerCodeCoverageReports", - "Workloads" - ] + "$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": [ - "Build", - "Clean", - "CoreBuild", - "CorePack", - "CoreRestore", - "CoreTest", - "Default", - "DotNetFormat", - "DotnetToolRestore", - "GenerateCodeCoverageBadges", - "GenerateCodeCoverageReport", - "GenerateCodeCoverageReportCobertura", - "GenerateCodeCoverageSummary", - "GenerateReadme", - "GitHubActions", - "JetBrainsCleanupCode", - "Lint", - "LintGitAdd", - "LintPublicApiAnalyzers", - "LintStaged", - "MoveUnshippedToShipped", - "Pack", - "PostLint", - "RegenerateBuildConfigurations", - "Restore", - "ShipPublicApis", - "Test", - "TriggerCodeCoverageReports", - "Workloads" - ] + "$ref": "#/definitions/ExecutableTarget" } }, "Verbosity": { - "type": "string", "description": "Logging verbosity during build execution. Default is 'Normal'", + "$ref": "#/definitions/Verbosity" + } + } + } + }, + "allOf": [ + { + "properties": { + "Artifacts": { + "type": "string", + "description": "The directory where artifacts are to be dropped" + }, + "Configuration": { + "type": "string", + "description": "Configuration to build", "enum": [ - "Minimal", - "Normal", - "Quiet", - "Verbose" + "Debug", + "Release" ] + }, + "Coverage": { + "type": "string", + "description": "The directory where coverage artifacts are to be dropped" + }, + "lint-files": { + "type": "array", + "description": "The files to lint, if not given lints all files", + "items": { + "type": "string" + } + }, + "Solution": { + "type": "string", + "description": "Path to a solution file that is automatically loaded" } } + }, + { + "$ref": "#/definitions/NukeBuild" } - } + ] }