Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
devlead committed Jan 21, 2025
2 parents e9a7286 + 806b65c commit 1c8f815
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
7 changes: 1 addition & 6 deletions GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,15 @@ next-version: 0.0.1
branches:
main:
mode: ContinuousDelivery
label: Minor
label: ''
increment: Minor
prevent-increment:
of-merged-branch: false
when-branch-merged: true # new branch related property
when-current-commit-tagged: true
track-merge-target: false
develop:
regex: ^dev(elop)?(ment)?$
mode: ContinuousDeployment
label: alpha
increment: Patch
prevent-increment:
of-merged-branch: false
when-branch-merged: false # new branch related property
when-current-commit-tagged: false
track-merge-target: true
3 changes: 2 additions & 1 deletion build/records.cake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ public record BuildData(
ArtifactsPath,
OutputPath
};
public bool ShouldPushGitHubPackages() => !string.IsNullOrWhiteSpace(GitHubNuGetSource)
public bool ShouldPushGitHubPackages() => IsMainBranch &&
!string.IsNullOrWhiteSpace(GitHubNuGetSource)
&& !string.IsNullOrWhiteSpace(GitHubNuGetApiKey);
public bool ShouldPushNuGetPackages() => IsMainBranch &&
!string.IsNullOrWhiteSpace(NuGetSource) &&
Expand Down

0 comments on commit 1c8f815

Please sign in to comment.