try and fix nugetpublish

RocketSurgeonsGuild · Dec 18, 2024 · 79b7081 · 79b7081
1 parent 66d89d9
commit 79b7081
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/.build/Build.CI.cs b/.build/Build.CI.cs
@@ -50,7 +50,7 @@
 [CloseMilestoneJob]
 [DraftReleaseJob]
 [UpdateMilestoneJob]
-[PublishNugetPackagesJob("RSG_NUGET_API_KEY", "ci", [])]
+[PublishNugetPackagesJob("RSG_NUGET_API_KEY", "ci")]
 [GitHubActionsVariable("THIS_IS_A_VARIABLE", Alias = "ThisIsAOtherVariable")]
 [GitHubActionsVariable("THIS_IS_ANOTHER_VARIABLE")]
 [GitHubActionsInput("THIS_IS_A_INPUT" /*, Alias = "ThisIsAInput"*/)]

diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -57,7 +57,7 @@ jobs:
       - name: nuget.org
         env:
           ApiKey: '${{ secrets.RSG_NUGET_API_KEY }}'
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.event.workflow_run.head_branch, 'v') && contains(github.event.workflow_run.head_branch, '.') && !contains(github.event.workflow_run.head_branch, '/')
         shell: pwsh
         run: |
           dotnet nuget push **/*.nupkg  --skip-duplicate -s nuget.org --api-key $ENV:ApiKey

diff --git a/src/Nuke/GithubActions/GithubActionCondition.cs b/src/Nuke/GithubActions/GithubActionCondition.cs
@@ -4,15 +4,20 @@ namespace Rocket.Surgery.Nuke.GithubActions;
 /// <summary>
 ///     Defines an action condition
 /// </summary>
+/// <remarks>
+///     The default constructor
+/// </remarks>
+/// <param name="condition"></param>
 [PublicAPI]
-public class GithubActionCondition
+[System.Diagnostics.DebuggerDisplay("{DebuggerDisplay,nq}")]
+public class GithubActionCondition(string condition)
 {
     /// <summary>
     ///     Convert the condition expression to a string.
     /// </summary>
     /// <param name="condition"></param>
     /// <returns></returns>
-    public static implicit operator string?(GithubActionCondition? condition) => condition?.Condition;
+    public static implicit operator string(GithubActionCondition condition) => condition.Condition;
 
     /// <summary>
     ///     Convert an expression string into a GithubActionCondition
@@ -41,17 +46,20 @@ public class GithubActionCondition
     /// </summary>
     public static GithubActionCondition Failure { get; } = new("failure()");
 
-    /// <summary>
-    ///     The default constructor
-    /// </summary>
-    /// <param name="condition"></param>
-    public GithubActionCondition(string condition) => Condition = condition;
-
     /// <summary>
     ///     The condition expression
     /// </summary>
-    public string? Condition { get; }
+    public string Condition { get; } = condition;
+
+    [System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)]
+    private string DebuggerDisplay
+    {
+        get
+        {
+            return ToString();
+        }
+    }
 
     /// <inheritdoc />
-    public override string? ToString() => Condition;
+    public override string ToString() => Condition;
 }
diff --git a/src/Nuke/Jobs/PublishNugetPackagesJobAttribute.cs b/src/Nuke/Jobs/PublishNugetPackagesJobAttribute.cs
@@ -19,7 +19,9 @@ public sealed class PublishNugetPackagesJobAttribute : GitHubActionsStepsAttribu
 {
     private readonly string _secretKey;
     private readonly string _triggeringWorkflow;
-    private readonly GithubActionCondition _nugetOrgCondition;
+
+    private readonly GithubActionCondition _nugetOrgCondition =
+        "startsWith(github.event.workflow_run.head_branch, 'v') && contains(github.event.workflow_run.head_branch, '.') && !contains(github.event.workflow_run.head_branch, '/')";
     private readonly ImmutableArray<string> _includeBranches;
 
     /// <summary>
@@ -29,8 +31,8 @@ public PublishNugetPackagesJobAttribute(string secretKey, string triggeringWorkf
     {
         _secretKey = secretKey;
         _triggeringWorkflow = triggeringWorkflow;
-        _nugetOrgCondition = nugetOrgCondition ?? "startsWith(github.ref, 'refs/tags/')";
-        _includeBranches = [.. includeBranches ?? ["master", "main", "v*"]];
+        _nugetOrgCondition = nugetOrgCondition ?? _nugetOrgCondition;
+        _includeBranches = [.. includeBranches ?? Array.Empty<string>()];
     }
 
     /// <summary>
@@ -40,7 +42,7 @@ public PublishNugetPackagesJobAttribute(string secretKey, string triggeringWorkf
     {
         _secretKey = secretKey;
         _triggeringWorkflow = triggeringWorkflow;
-        _nugetOrgCondition = nugetOrgCondition ?? "startsWith(github.ref, 'refs/tags/')";
+        _nugetOrgCondition = nugetOrgCondition ?? _nugetOrgCondition;
         _includeBranches = [.. includeBranches];
     }
 
@@ -51,8 +53,8 @@ public PublishNugetPackagesJobAttribute(string secretKey, string triggeringWorkf
     {
         _secretKey = secretKey;
         _triggeringWorkflow = triggeringWorkflow;
-        _nugetOrgCondition = nugetOrgCondition ?? "startsWith(github.ref, 'refs/tags/')";
-        _includeBranches = [.. includeBranches ?? ["master", "main", "v*"]];
+        _nugetOrgCondition = nugetOrgCondition ?? _nugetOrgCondition;
+        _includeBranches = [.. includeBranches ?? Array.Empty<string>()];
     }
 
     private string DebuggerDisplay => ToString();