Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
permissions:
contents: write
needs: [ TestProjects, PackProjects, SetupBuildInfo ]
if: contains(needs.SetupBuildInfo.outputs.build-version, '-') == false
if: ${{ !contains(needs.SetupBuildInfo.outputs.build-version, '-') }}
runs-on: ubuntu-latest
steps:

Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
permissions:
contents: write
needs: [ SetupBuildInfo, BuildDocs ]
if: contains(needs.SetupBuildInfo.outputs.build-version, '-') == false
if: ${{ !contains(needs.SetupBuildInfo.outputs.build-version, '-') }}
runs-on: ubuntu-latest
steps:

Expand Down
22 changes: 8 additions & 14 deletions _atom/IBuild.cs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
[
new(nameof(TestFramework))
{
Values = TestFrameworkNames,
Values = [..TestFrameworkNames],
},
],
Options =
Expand All @@ -234,7 +234,7 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
})),
BuildOptions.Inject.Github.PullRequestNumber,
BuildOptions.Target.RunIfWorkflowCondition(
TextExpressions.GitHub.GitHubEventName.EqualToString("pull_request")),
Tex.GitHub.EventName.Eq("pull_request")),
],
},
new(nameof(WaitForCopilotReview))
Expand Down Expand Up @@ -269,7 +269,7 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
[
new(nameof(TestFramework))
{
Values = TestFrameworkNames,
Values = [..TestFrameworkNames],
},
],
},
Expand All @@ -286,11 +286,8 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
{
Contents = PermissionsLevel.Write
})),
BuildOptions.Target.RunIfWorkflowCondition(TextExpressions
.Target
.ParamOutput(this, nameof(SetupBuildInfo), nameof(BuildVersion))
.Contains("-")
.EqualTo(false))
BuildOptions.Target.RunIfWorkflowCondition(
!Tex.ParamOutput(this, nameof(SetupBuildInfo), nameof(BuildVersion)).Contains("-"))
]
},
new(nameof(PublishDocs))
Expand All @@ -302,11 +299,8 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
{
Contents = PermissionsLevel.Write,
})),
BuildOptions.Target.RunIfWorkflowCondition(TextExpressions
.Target
.ParamOutput(this, nameof(SetupBuildInfo), nameof(BuildVersion))
.Contains("-")
.EqualTo(false)),
BuildOptions.Target.RunIfWorkflowCondition(
!Tex.ParamOutput(this, nameof(SetupBuildInfo), nameof(BuildVersion)).Contains("-")),
],
},
],
Expand All @@ -324,7 +318,7 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
BuildOptions.Inject.Github.PullRequestNumber,
BuildOptions.Inject.Github.DependabotEnableAutoMergePat,
BuildOptions.Target.RunIfWorkflowCondition(
TextExpressions.GitHub.GitHubActor.EqualToString("dependabot[bot]")),
Tex.GitHub.Actor.Eq("dependabot[bot]")),
]
}
],
Expand Down
6 changes: 3 additions & 3 deletions _atom/_atom.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Invex.Atom.Module.GitHubWorkflows" Version="4.2.0" />
<PackageReference Include="Invex.Atom.Module.GitVersion" Version="4.2.0" />
<PackageReference Include="Invex.RepoUtils.Atom.Module" Version="2.0.0" />
<PackageReference Include="Invex.Atom.Module.GitHubWorkflows" Version="5.0.0-rc.5" />
<PackageReference Include="Invex.Atom.Module.GitVersion" Version="5.0.0-rc.5" />
<PackageReference Include="Invex.RepoUtils.Atom.Module" Version="3.0.0-rc.5" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading