Merge pull request #2802 from freddydk/master

Issue #2798
microsoft · Nov 25, 2022 · 25696ce · 25696ce
2 parents 1038190 + bf7776c
commit 25696ce
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -120,7 +120,17 @@ jobs:
             });
 
       - name: Checkout
+        if: github.event_name != 'workflow_run'
         uses: actions/checkout@v3
+        with:
+          lfs: true
+
+      - name: Checkout Pull Request
+        if: github.event_name == 'workflow_run'
+        uses: actions/checkout@v3
+        with:
+          lfs: true
+          ref: ${{ github.event.workflow_run.head_branch }}
 
       - name: Analyze
         id: Analyze
@@ -139,7 +149,17 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout
+        if: github.event_name != 'workflow_run'
         uses: actions/checkout@v3
+        with:
+          lfs: true
+
+      - name: Checkout Pull Request
+        if: github.event_name == 'workflow_run'
+        uses: actions/checkout@v3
+        with:
+          lfs: true
+          ref: ${{ github.event.workflow_run.head_branch }}
 
       - name: Run Tests
         run: |
@@ -259,5 +279,5 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               check_run_id: ${{ needs.Initialization.outputs.checkRunId }},
-              conclusion: '${{ needs.RunTests.result }}'
+              conclusion: '${{ needs.Build.result }}'
             });
diff --git a/ContainerInfo/Get-NavContainerSharedFolders.ps1 b/ContainerInfo/Get-NavContainerSharedFolders.ps1
@@ -26,10 +26,10 @@ try {
     $sharedFolders = @{}
     if ($inspect.HostConfig.Binds) {
         $inspect.HostConfig.Binds | ForEach-Object {
-            $idx = $_.IndexOf(':', $_.IndexOf(':') + 1)
+            $idx = $_.IndexOf(':', 2)
             $src = $_.Substring(0, $idx).TrimEnd('\')
             $dst = $_.SubString($idx+1)
-            $idx = $dst.IndexOf(':', $_.IndexOf(':') + 1)
+            $idx = $dst.IndexOf(':', 2)
             if ($idx -gt 0) {
                 $dst = $dst.SubString(0,$idx)
             }

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -7,6 +7,7 @@ Add new parameter to New-BcImage - databaseBackupPath which allows selecting cus
 Add new setting renewClientContextBetweenTests as default value for the same parameter in Run-TestsInBcContainer
 Change PR process for ContainerHelper
 Wait for tenants to be ready after Restart-BcContainer
+Issue #2798 Get-NavContainerSharedFolders returns error The length must not be less than 0 (zero)
 
 4.0.6
 Check latest allowed runtime version in Run-AlValidation