Merge pull request #1283 from SMI/dependabot/nuget/master/HIC.RDMP.Pl…

…ugin-7.0.18 Bump HIC.RDMP.Plugin from 7.0.17 to 7.0.18
SMI · Aug 31, 2022 · 6472d6b · 6472d6b
2 parents fd77708 + 77de30f
commit 6472d6b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -64,12 +64,6 @@ jobs:
       run: |
         Set-Service mongodb -StartupType Automatic
         Start-Service -Name mongodb
-    - uses: actions/cache@v3
-      with:
-        path: ~/.nuget/packages
-        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
-        restore-keys: |
-          ${{ runner.os }}-nuget-
     - name: setup .NET
       # NOTE(rkm 2022-02-20) Uses global.json
       uses: actions/setup-dotnet@v2
@@ -88,7 +82,7 @@ jobs:
       run: |
         set -euxo pipefail
         rdmp_cli_ver=$(grep -F -m1 HIC.RDMP.Plugin src/common/Smi.Common/Smi.Common.csproj | sed -n 's/.*Version="\([0-9.]*\)".*/\1/p')
-        echo "rdmp_cli_ver=v$rdmp_cli_ver" >> $GITHUB_ENV
+        echo "rdmp_cli_ver=$rdmp_cli_ver" >> $GITHUB_ENV
     - name: "[windows] Install SQL LocalDB"
       if: ${{ matrix.os == 'windows' }}
       uses: crazy-max/ghaction-chocolatey@v2
@@ -107,7 +101,13 @@ jobs:
       if: ${{ matrix.os == 'windows' }}
       run: ./bin/smi/writeDatabaseStrings.py "(localdb)\MSSQLLocalDB" "${{ env.db-password }}"
     - name: download rdmp-cli
+      if: ${{ matrix.os == 'windows' }}
       run: ./bin/smi/downloadRdmpCli.py ${{ env.rdmp_cli_ver }}
+    - name: download rdmp-cli
+      if: ${{ matrix.os == 'linux' }}
+      run: |
+        curl -L https://github.com/HicServices/RDMP/releases/download/v${{ env.rdmp_cli_ver }}/rdmp-${{ env.rdmp_cli_ver }}-cli-linux-x64.tar.xz | tar xJf -
+        mv rdmp-${{ env.rdmp_cli_ver }}-cli-linux rdmp-cli
     - name: install RDMP databases
       run: ${{ env.rdmp-cli-dir }}/rdmp install --createdatabasetimeout 180 ${{ env.rdmp_conn_str }} TEST_
     - name: show dotnet info

diff --git a/bin/smi/downloadRdmpCli.py b/bin/smi/downloadRdmpCli.py
@@ -41,7 +41,7 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
     platform = "linux" if os.name == "posix" else "win"
     url = (
         "https://github.com/HicServices/RDMP/releases/download/"
-        f"{args.version}/rdmp-cli-{platform}-x64.zip"
+        f"v{args.version}/rdmp-{args.version}-cli-{platform}-x64.zip"
     )
     print(f"Downloading {url}")
     with tempfile.TemporaryDirectory() as tmpdir:

diff --git a/src/applications/Setup/Setup.csproj b/src/applications/Setup/Setup.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.17" />
+    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.18" />
     <PackageReference Include="Spectre.Console" Version="0.44.0" />
     <PackageReference Include="Terminal.Gui" Version="1.7.2" />
   </ItemGroup>

diff --git a/src/common/Smi.Common/Smi.Common.csproj b/src/common/Smi.Common/Smi.Common.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.1" />
     <PackageReference Include="HIC.FAnsiSql" Version="3.0.0" />
   	<PackageReference Include="IsIdentifiable" Version="0.0.7" />
-    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.17" />
+    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.18" />
     <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NLog" Version="5.0.2" />