Skip to content

Commit 9d2b981

Browse files
committed
Merge branch 'main' into develop
Signed-off-by: Victor Chang <vicchang@nvidia.com>
2 parents bb05540 + dd2c648 commit 9d2b981

Some content is hidden

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

44 files changed

+46
-52
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,21 @@ jobs:
603603
separator: "/"
604604
msg: ${{ github.repository }}
605605

606+
- name: Unzip docs
607+
if: ${{ contains(github.ref, 'refs/heads/main') }}
608+
run: |
609+
mkdir userguide
610+
unzip artifacts/mig-docs-${{ env.SEMVER }}.zip -d userguide/
611+
ls -lR userguide/
612+
613+
- name: Deploy Docs
614+
uses: peaceiris/actions-gh-pages@v3
615+
if: ${{ contains(github.ref, 'refs/heads/main') }}
616+
with:
617+
github_token: ${{ secrets.GITHUB_TOKEN }}
618+
publish_dir: userguide/
619+
publish_branch: docs
620+
606621
- name: Install GitReleaseManager
607622
uses: gittools/actions/gitreleasemanager/setup@v3.1.11
608623
with:

src/Api/Mllp/IMllpClient.cs

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ public interface IMllpClient : IDisposable
2828

2929
Task Start(Func<IMllpClient, MllpClientResult, Task> onDisconnect, CancellationToken cancellationToken);
3030
}
31-
}
31+
}

src/Api/Storage/FileStorageMetadata.cs

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,4 @@ public static string IpAddress()
162162
return "127.0.0.1";
163163
}
164164
}
165-
}
165+
}

src/Api/packages.lock.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,8 @@
257257
},
258258
"System.Diagnostics.DiagnosticSource": {
259259
"type": "Transitive",
260-
"resolved": "6.0.0",
261-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
262-
"dependencies": {
263-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
264-
}
260+
"resolved": "8.0.0",
261+
"contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ=="
265262
},
266263
"System.IO.Abstractions": {
267264
"type": "Transitive",

src/Client/packages.lock.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,8 @@
244244
},
245245
"System.Diagnostics.DiagnosticSource": {
246246
"type": "Transitive",
247-
"resolved": "6.0.0",
248-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
249-
"dependencies": {
250-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
251-
}
247+
"resolved": "8.0.0",
248+
"contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ=="
252249
},
253250
"System.IO.Abstractions": {
254251
"type": "Transitive",

src/Configuration/Test/packages.lock.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,8 @@
325325
},
326326
"System.Diagnostics.DiagnosticSource": {
327327
"type": "Transitive",
328-
"resolved": "6.0.0",
329-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
330-
"dependencies": {
331-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
332-
}
328+
"resolved": "8.0.0",
329+
"contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ=="
333330
},
334331
"System.Diagnostics.EventLog": {
335332
"type": "Transitive",

src/Configuration/packages.lock.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,8 @@
250250
},
251251
"System.Diagnostics.DiagnosticSource": {
252252
"type": "Transitive",
253-
"resolved": "6.0.0",
254-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
255-
"dependencies": {
256-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
257-
}
253+
"resolved": "8.0.0",
254+
"contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ=="
258255
},
259256
"System.IO.Abstractions": {
260257
"type": "Transitive",

src/Database/Api/DatabaseRegistrationBase.cs

100755100644
File mode changed.

src/Database/Api/StorageMetadataWrapper.cs

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ public override string ToString()
9090
return $"Identity: {Identity}";
9191
}
9292
}
93-
}
93+
}

src/Database/Api/packages.lock.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,8 @@
250250
},
251251
"System.Diagnostics.DiagnosticSource": {
252252
"type": "Transitive",
253-
"resolved": "6.0.0",
254-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
255-
"dependencies": {
256-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
257-
}
253+
"resolved": "8.0.0",
254+
"contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ=="
258255
},
259256
"System.IO.Abstractions": {
260257
"type": "Transitive",

0 commit comments

Comments
 (0)