Skip to content

Commit 8ca4a1e

Browse files
cjdutoitcjdutoit
authored
Merge pull request #156 from The-Standard-Organization/users/cjdutoit/minorfix-linter-requireissueortaskjob
MINOR FIX: Quotes / Backticks In The Body Break Shell Command
2 parents 25cc16b + 0b27de9 commit 8ca4a1e

12 files changed

Lines changed: 42 additions & 82 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
- name: Setup .Net
123123
uses: actions/setup-dotnet@v3
124124
with:
125-
dotnet-version: 9.0.100
125+
dotnet-version: 10.x
126126
- name: Restore
127127
run: dotnet restore
128128
- name: Build

‎.github/workflows/prLinter.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,17 @@ jobs:
111111
- name: Check For Associated Issues Or Tasks
112112
id: check_for_issues_or_tasks
113113
if: ${{ steps.get_pr_info.outputs.prOwner != 'dependabot[bot]' }}
114+
env:
115+
PR_BODY: ${{ steps.get_pr_info.outputs.description }}
114116
run: >2-
115-
PR_BODY="${{ steps.get_pr_info.outputs.description }}"
116-
echo "::notice::Raw PR Body: $PR_BODY"
117-
118-
if [[ -z "$PR_BODY" ]]; then
117+
if [[ -z "${PR_BODY:-}" ]]; then
119118
echo "Error: PR description does not contain any links to issue(s)/task(s) (e.g., 'closes #123' / 'closes AB#123' / 'fixes #123' / 'fixes AB#123')."
120119
exit 1
121120
fi
122121
123-
PR_BODY=$(echo "$PR_BODY" | tr -s '\r\n' ' ' | tr '\n' ' ' | xargs)
124-
echo "::notice::Normalized PR Body: $PR_BODY"
122+
NORMALIZED_PR_BODY=$(printf '%s' "$PR_BODY" | tr '\r\n' ' ' | tr -s ' ')
125123
126-
if echo "$PR_BODY" | grep -Piq "((close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*(\[#\d+\]|\#\d+)|(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*(\[AB#\d+\]|AB#\d+))"; then
124+
if printf '%s' "$NORMALIZED_PR_BODY" | grep -Piq "(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*(\[#[0-9]+\]|#[0-9]+|\[AB#[0-9]+\]|AB#[0-9]+)"; then
127125
echo "Valid PR description."
128126
else
129127
echo "Error: PR description does not contain any links to issue(s)/task(s) (e.g., 'closes #123' / 'closes AB#123' / 'fixes #123' / 'fixes AB#123')."

‎ADotNet.Infrastructure.Build/ADotNet.Infrastructure.Build.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

‎ADotNet.Infrastructure.Build/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ static void Main(string[] args)
1717
scriptGenerationService.GenerateBuildScript(
1818
branchName: "main",
1919
projectName: "ADotNet",
20-
dotNetVersion: "9.0.100");
20+
dotNetVersion: "10.x");
2121

2222
scriptGenerationService.GeneratePrLintScript(branchName: "main");
2323
}

‎ADotNet.sln‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎ADotNet.slnx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path=".editorconfig" />
4+
<File Path=".github/workflows/build.yml" />
5+
</Folder>
6+
<Project Path="AdoNet.Tests.Console/ADotNet.Tests.Console.csproj" />
7+
<Project Path="AdoNet.Tests.Unit/ADotNet.Tests.Unit.csproj" />
8+
<Project Path="ADotNet.Infrastructure.Build/ADotNet.Infrastructure.Build.csproj" />
9+
<Project Path="ADotNet/ADotNet.csproj" />
10+
</Solution>

‎ADotNet/ADotNet.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net10.0</TargetFrameworks>
55
<LangVersion>11.0</LangVersion>
66
<Copyright>Copyright (c) The Standard Community</Copyright>
77
<Description>
@@ -57,9 +57,9 @@
5757
</ItemGroup>
5858

5959
<ItemGroup>
60-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
61-
<PackageReference Include="Xeption" Version="2.5.0" />
62-
<PackageReference Include="YamlDotNet" Version="13.1.0" />
60+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
61+
<PackageReference Include="Xeption" Version="2.8.0" />
62+
<PackageReference Include="YamlDotNet" Version="17.1.0" />
6363
</ItemGroup>
6464

6565
<ItemGroup>

‎ADotNet/Models/Pipelines/GithubPipelines/DotNets/RequireIssueOrTaskJob.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ public RequireIssueOrTaskJob()
6363
If = "${{ steps.get_pr_info.outputs.prOwner != 'dependabot[bot]' }}",
6464
Id = "check_for_issues_or_tasks",
6565
Shell = "bash",
66+
EnvironmentVariables = new Dictionary<string, string>
67+
{
68+
{ "PR_BODY", "${{ steps.get_pr_info.outputs.description }}" }
69+
},
6670
Run =
6771
"""
68-
PR_BODY="${{ steps.get_pr_info.outputs.description }}"
69-
echo "::notice::Raw PR Body: $PR_BODY"
70-
71-
if [[ -z "$PR_BODY" ]]; then
72+
if [[ -z "${PR_BODY:-}" ]]; then
7273
echo "Error: PR description does not contain any links to issue(s)/task(s) (e.g., 'closes #123' / 'closes AB#123' / 'fixes #123' / 'fixes AB#123')."
7374
exit 1
7475
fi
7576
76-
PR_BODY=$(echo "$PR_BODY" | tr -s '\r\n' ' ' | tr '\n' ' ' | xargs)
77-
echo "::notice::Normalized PR Body: $PR_BODY"
77+
NORMALIZED_PR_BODY=$(printf '%s' "$PR_BODY" | tr '\r\n' ' ' | tr -s ' ')
7878
79-
if echo "$PR_BODY" | grep -Piq "((close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*(\[#\d+\]|\#\d+)|(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*(\[AB#\d+\]|AB#\d+))"; then
79+
if printf '%s' "$NORMALIZED_PR_BODY" | grep -Piq "(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*(\[#[0-9]+\]|#[0-9]+|\[AB#[0-9]+\]|AB#[0-9]+)"; then
8080
echo "Valid PR description."
8181
else
8282
echo "Error: PR description does not contain any links to issue(s)/task(s) (e.g., 'closes #123' / 'closes AB#123' / 'fixes #123' / 'fixes AB#123')."

‎AdoNet.Tests.Console/ADotNet.Tests.Console.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

‎AdoNet.Tests.Unit/ADotNet.Tests.Unit.csproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="FluentAssertions" Version="6.5.1" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0-preview-20220131-20" />
11-
<PackageReference Include="Moq" Version="4.17.1" />
12-
<PackageReference Include="Tynamix.ObjectFiller" Version="1.5.7" />
13-
<PackageReference Include="xunit" Version="2.4.2-pre.12" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
9+
<PackageReference Include="FluentAssertions" Version="[7.2.2]" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
11+
<PackageReference Include="Moq" Version="4.20.72" />
12+
<PackageReference Include="Tynamix.ObjectFiller" Version="1.5.9" />
13+
<PackageReference Include="xunit.v3" Version="3.2.2" />
14+
<PackageReference Include="xunit.analyzers" Version="1.27.0" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1516
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1617
<PrivateAssets>all</PrivateAssets>
1718
</PackageReference>
18-
<PackageReference Include="coverlet.collector" Version="3.1.2">
19+
<PackageReference Include="coverlet.collector" Version="10.0.0">
1920
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2021
<PrivateAssets>all</PrivateAssets>
2122
</PackageReference>

0 commit comments

Comments
 (0)