Merge pull request #321 from StartAutomating/ugit-collaboration

ugit 0.4.5
StartAutomating · Oct 16, 2024 · 4a2a585 · 4a2a585
2 parents 927343c + f46e804
commit 4a2a585
Show file tree

Hide file tree

Showing 80 changed files with 2,531 additions and 367 deletions.
diff --git a/.github/workflows/OnIssue.yml → .github/workflows/GitPub.yml b/.github/workflows/OnIssue.yml → .github/workflows/GitPub.yml
@@ -1,7 +1,6 @@
 
-name: OnIssueChanged
+name: GitPub
 on: 
-  issues: 
   workflow_dispatch: 
 jobs: 
   RunGitPub: 
@@ -14,7 +13,7 @@ jobs:
         uses: StartAutomating/GitPub@main
         id: GitPub
         with: 
-          TargetBranch: edits-$([DateTime]::Now.ToString("r").Replace(":","-").Replace(" ", ""))
+          TargetBranch: edits-$([DateTime]::Now.ToString("o") -replace "T.+$")
           CommitMessage: Posting with GitPub [skip ci]
           PublishParameters: |
             {

diff --git a/.github/workflows/TestAndPublish.yml b/.github/workflows/TestAndPublish.yml
@@ -117,7 +117,7 @@ jobs:
           Install-Module -Name Pester -Repository PSGallery -Force -Scope CurrentUser -MaximumVersion $PesterMaxVersion -SkipPublisherCheck -AllowClobber
           Import-Module Pester -Force -PassThru -MaximumVersion $PesterMaxVersion} @Parameters
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: RunPester
         id: RunPester
         shell: pwsh
@@ -174,9 +174,6 @@ jobs:
           $result = 
               Invoke-Pester -PassThru -Verbose -OutputFile ".\$moduleName.TestResults.xml" -OutputFormat NUnitXml @codeCoverageParameters
           
-          "::set-output name=TotalCount::$($result.TotalCount)",
-          "::set-output name=PassedCount::$($result.PassedCount)",
-          "::set-output name=FailedCount::$($result.FailedCount)" | Out-Host
           if ($result.FailedCount -gt 0) {
               "::debug:: $($result.FailedCount) tests failed"
               foreach ($r in $result.TestResult) {
@@ -188,7 +185,7 @@ jobs:
           }
           } @Parameters
       - name: PublishTestResults
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with: 
           name: PesterResults
           path: '**.TestResults.xml'
@@ -575,13 +572,21 @@ jobs:
     if: ${{ success() }}
     steps: 
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: GitLogger
         uses: GitLogging/GitLoggerAction@main
         id: GitLogger
       - name: Use PSSVG Action
         uses: StartAutomating/PSSVG@main
         id: PSSVG
+      - name: Run ugit (from main)
+        if: ${{github.ref_name == 'main'}}
+        uses: StartAutomating/ugit@main
+        id: ugitMain
+      - name: Run ugit (on branch)
+        if: ${{github.ref_name != 'main'}}
+        uses: ./
+        id: ugitBranch
       - name: BuildPipeScript
         uses: StartAutomating/PipeScript@main
       - name: UsePiecemeal