Skip to content

Commit

Permalink
Merge pull request #38 from Titlehhhh/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
Titlehhhh authored Nov 27, 2023
2 parents 8e79c75 + 12ca2eb commit 4a8d084
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ on:
- '**/*.md'
- '**/*.gitignore'
- '**/*.gitattributes'
pull_request:
branches:
- preview
- main
- rc
paths-ignore:
- '**/*.md'
- '**/*.gitignore'
- '**/*.gitattributes'
#pull_request:
# branches:
# - preview
# - main
# - rc
# paths-ignore:
# - '**/*.md'
# - '**/*.gitignore'
# - '**/*.gitattributes'
workflow_dispatch:

jobs:
Expand Down
9 changes: 5 additions & 4 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ class Build : NukeBuild
.Requires(() => Configuration.Equals(Configuration.Release))
.Executes(() =>
{
Console.WriteLine("Version: " + MinVer.Version);

DotNetNuGetPush(s => s
.SetTargetPath($"{ArtifactsDirectory}/**/*.nupkg")
.SetSource("https://f.feedz.io/holyclient/holyclient/nuget/index.json")
Expand All @@ -243,7 +245,7 @@ class Build : NukeBuild
.Executes(() =>
{



var publishCombinations =
from project in new[] { Solution.Platfroms.HolyClient_Desktop }
Expand Down Expand Up @@ -276,7 +278,6 @@ from framework in project.GetTargetFrameworks()
Target CreateRelease => _ => _
.Description($"Creating release for the publishable version.")
.Requires(() => Configuration.Equals(Configuration.Release))
.OnlyWhenStatic(() => GitRepository.IsOnDevelopBranch() || GitRepository.IsOnReleaseBranch())
.Executes(async () =>
{
var credentials = new Credentials(GitHubActions.Token);
Expand All @@ -296,7 +297,7 @@ from framework in project.GetTargetFrameworks()
Draft = true,
Name = $"v{releaseTag}",
Prerelease = !string.IsNullOrEmpty(MinVer.MinVerPreRelease),
Body = "Test Release"
Body = "Preview release"
};

var createdRelease = await GitHubTasks
Expand All @@ -318,7 +319,7 @@ from framework in project.GetTargetFrameworks()
.Release
.Edit(owner, name, createdRelease.Id, new ReleaseUpdate { Draft = false });


});


Expand Down

0 comments on commit 4a8d084

Please sign in to comment.