Skip to content

Commit 4a2a585

Browse files
Merge pull request #321 from StartAutomating/ugit-collaboration
ugit 0.4.5
2 parents 927343c + f46e804 commit 4a2a585

File tree

80 files changed

+2531
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2531
-367
lines changed

.github/workflows/OnIssue.yml .github/workflows/GitPub.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

2-
name: OnIssueChanged
2+
name: GitPub
33
on:
4-
issues:
54
workflow_dispatch:
65
jobs:
76
RunGitPub:
@@ -14,7 +13,7 @@ jobs:
1413
uses: StartAutomating/GitPub@main
1514
id: GitPub
1615
with:
17-
TargetBranch: edits-$([DateTime]::Now.ToString("r").Replace(":","-").Replace(" ", ""))
16+
TargetBranch: edits-$([DateTime]::Now.ToString("o") -replace "T.+$")
1817
CommitMessage: Posting with GitPub [skip ci]
1918
PublishParameters: |
2019
{

.github/workflows/TestAndPublish.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
Install-Module -Name Pester -Repository PSGallery -Force -Scope CurrentUser -MaximumVersion $PesterMaxVersion -SkipPublisherCheck -AllowClobber
118118
Import-Module Pester -Force -PassThru -MaximumVersion $PesterMaxVersion} @Parameters
119119
- name: Check out repository
120-
uses: actions/checkout@v2
120+
uses: actions/checkout@v4
121121
- name: RunPester
122122
id: RunPester
123123
shell: pwsh
@@ -174,9 +174,6 @@ jobs:
174174
$result =
175175
Invoke-Pester -PassThru -Verbose -OutputFile ".\$moduleName.TestResults.xml" -OutputFormat NUnitXml @codeCoverageParameters
176176
177-
"::set-output name=TotalCount::$($result.TotalCount)",
178-
"::set-output name=PassedCount::$($result.PassedCount)",
179-
"::set-output name=FailedCount::$($result.FailedCount)" | Out-Host
180177
if ($result.FailedCount -gt 0) {
181178
"::debug:: $($result.FailedCount) tests failed"
182179
foreach ($r in $result.TestResult) {
@@ -188,7 +185,7 @@ jobs:
188185
}
189186
} @Parameters
190187
- name: PublishTestResults
191-
uses: actions/upload-artifact@v2
188+
uses: actions/upload-artifact@v3
192189
with:
193190
name: PesterResults
194191
path: '**.TestResults.xml'
@@ -575,13 +572,21 @@ jobs:
575572
if: ${{ success() }}
576573
steps:
577574
- name: Check out repository
578-
uses: actions/checkout@v2
575+
uses: actions/checkout@v4
579576
- name: GitLogger
580577
uses: GitLogging/GitLoggerAction@main
581578
id: GitLogger
582579
- name: Use PSSVG Action
583580
uses: StartAutomating/PSSVG@main
584581
id: PSSVG
582+
- name: Run ugit (from main)
583+
if: ${{github.ref_name == 'main'}}
584+
uses: StartAutomating/ugit@main
585+
id: ugitMain
586+
- name: Run ugit (on branch)
587+
if: ${{github.ref_name != 'main'}}
588+
uses: ./
589+
id: ugitBranch
585590
- name: BuildPipeScript
586591
uses: StartAutomating/PipeScript@main
587592
- name: UsePiecemeal

0 commit comments

Comments
 (0)