Updating workflow and source files (being more clear about what is being skipped)

StartAutomating · StartAutomating · commit 2d018d302f08 · 2021-09-27T22:49:52.000-07:00
diff --git a/.github/workflows/TestAndPublish.yml b/.github/workflows/TestAndPublish.yml
@@ -252,7 +252,7 @@ jobs:
           
           if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and 
               (-not $gitHubEvent.psobject.properties['inputs'])) {
-              "::warning::Pull Request has not merged, skipping" | Out-Host
+              "::warning::Pull Request has not merged, skipping Tagging" | Out-Host
               return
           }
           
@@ -343,7 +343,7 @@ jobs:
           
           if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and 
               (-not $gitHubEvent.psobject.properties['inputs'])) {
-              "::warning::Pull Request has not merged, skipping" | Out-Host
+              "::warning::Pull Request has not merged, skipping GitHub release" | Out-Host
               return
           }
           
@@ -428,7 +428,7 @@ jobs:
           
           if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and 
               (-not $gitHubEvent.psobject.properties['inputs'])) {
-              "::warning::Pull Request has not merged, skipping" | Out-Host
+              "::warning::Pull Request has not merged, skipping Gallery Publish" | Out-Host
               return
           }
           
diff --git a/GitHub/Steps/PublishPowerShellGallery.ps1 b/GitHub/Steps/PublishPowerShellGallery.ps1
@@ -15,7 +15,7 @@ $($gitHubEvent | ConvertTo-Json -Depth 100)
 
 if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and 
     (-not $gitHubEvent.psobject.properties['inputs'])) {
-    "::warning::Pull Request has not merged, skipping" | Out-Host
+    "::warning::Pull Request has not merged, skipping Gallery Publish" | Out-Host
     return
 }
 
diff --git a/GitHub/Steps/ReleaseModule.ps1 b/GitHub/Steps/ReleaseModule.ps1
@@ -30,7 +30,7 @@ $($gitHubEvent | ConvertTo-Json -Depth 100)
 
 if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and 
     (-not $gitHubEvent.psobject.properties['inputs'])) {
-    "::warning::Pull Request has not merged, skipping" | Out-Host
+    "::warning::Pull Request has not merged, skipping GitHub release" | Out-Host
     return
 }
 
diff --git a/GitHub/Steps/TagModuleVersion.ps1 b/GitHub/Steps/TagModuleVersion.ps1
@@ -35,7 +35,7 @@ $($gitHubEvent | ConvertTo-Json -Depth 100)
 
 if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and 
     (-not $gitHubEvent.psobject.properties['inputs'])) {
-    "::warning::Pull Request has not merged, skipping" | Out-Host
+    "::warning::Pull Request has not merged, skipping Tagging" | Out-Host
     return
 }
 

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ jobs:`
`252`	`252`
`253`	`253`	`if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and`
`254`	`254`	`(-not $gitHubEvent.psobject.properties['inputs'])) {`
`255`		`- "::warning::Pull Request has not merged, skipping" \| Out-Host`
	`255`	`+ "::warning::Pull Request has not merged, skipping Tagging" \| Out-Host`
`256`	`256`	`return`
`257`	`257`	`}`
`258`	`258`
`@@ -343,7 +343,7 @@ jobs:`
`343`	`343`
`344`	`344`	`if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and`
`345`	`345`	`(-not $gitHubEvent.psobject.properties['inputs'])) {`
`346`		`- "::warning::Pull Request has not merged, skipping" \| Out-Host`
	`346`	`+ "::warning::Pull Request has not merged, skipping GitHub release" \| Out-Host`
`347`	`347`	`return`
`348`	`348`	`}`
`349`	`349`
`@@ -428,7 +428,7 @@ jobs:`
`428`	`428`
`429`	`429`	`if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and`
`430`	`430`	`(-not $gitHubEvent.psobject.properties['inputs'])) {`
`431`		`- "::warning::Pull Request has not merged, skipping" \| Out-Host`
	`431`	`+ "::warning::Pull Request has not merged, skipping Gallery Publish" \| Out-Host`
`432`	`432`	`return`
`433`	`433`	`}`
`434`	`434`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ $($gitHubEvent \| ConvertTo-Json -Depth 100)`
`15`	`15`
`16`	`16`	`if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and`
`17`	`17`	`(-not $gitHubEvent.psobject.properties['inputs'])) {`
`18`		`- "::warning::Pull Request has not merged, skipping" \| Out-Host`
	`18`	`+ "::warning::Pull Request has not merged, skipping Gallery Publish" \| Out-Host`
`19`	`19`	`return`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ $($gitHubEvent \| ConvertTo-Json -Depth 100)`
`30`	`30`
`31`	`31`	`if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and`
`32`	`32`	`(-not $gitHubEvent.psobject.properties['inputs'])) {`
`33`		`- "::warning::Pull Request has not merged, skipping" \| Out-Host`
	`33`	`+ "::warning::Pull Request has not merged, skipping GitHub release" \| Out-Host`
`34`	`34`	`return`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ $($gitHubEvent \| ConvertTo-Json -Depth 100)`
`35`	`35`
`36`	`36`	`if (-not ($gitHubEvent.head_commit.message -match "Merge Pull Request #(?<PRNumber>\d+)") -and`
`37`	`37`	`(-not $gitHubEvent.psobject.properties['inputs'])) {`
`38`		`- "::warning::Pull Request has not merged, skipping" \| Out-Host`
	`38`	`+ "::warning::Pull Request has not merged, skipping Tagging" \| Out-Host`
`39`	`39`	`return`
`40`	`40`	`}`
`41`	`41`