Bump senzing-factory/github-action-install-senzing-sdk from 2 to 3 (#26)

dependabot[bot] · kernelsam · barrycaceres · web-flow · commit 84c116de05f5 · 2025-02-27T13:33:04.000-08:00
* Bump senzing-factory/github-action-install-senzing-sdk from 2 to 3 Bumps [senzing-factory/github-action-install-senzing-sdk](https://github.com/senzing-factory/github-action-install-senzing-sdk) from 2 to 3. - [Release notes](https://github.com/senzing-factory/github-action-install-senzing-sdk/releases) - [Changelog](https://github.com/senzing-factory/github-action-install-senzing-sdk/blob/main/CHANGELOG.md) - [Commits](senzing-factory/github-action-install-senzing-sdk@v2...v3) --- updated-dependencies: - dependency-name: senzing-factory/github-action-install-senzing-sdk dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * update install paths * linting updates and path fixes * test * Updated finding of default paths * debug * Debug SENZING_DIR since it cannot find the sz-sdk.jar * Hard-code SENZING_DIR in pom.xml to check if the problem lies there * Minor update to darwin java DYLD_LIBRARY_PATH * Another try -- tired of commit messsages * Another try -- tired of commit messsages * Another try -- tired of commit messsages * Added export for environmment variables * cleanup environment configuration * test * cleanup * Add debugging to C# InstallLocations.cs to determine why the support path is wrong * Add debugging to C# InstallLocations.cs to determine why the support path is wrong * Add debugging to C# InstallLocations.cs to determine why the support path is wrong * Add debugging to C# InstallLocations.cs to determine why the support path is wrong * Add debugging to C# InstallLocations.cs to determine why the support path is wrong * Add debugging to C# InstallLocations.cs to determine why the support path is wrong * Removed SENZING_DATA_DIR from github workflow for C# darwin * Removed SENZING_DATA_DIR from github workflow for C# darwin * Removed debugging code from InstallLocations.cs and fixed OS detection --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sam <109683132+kernelsam@users.noreply.github.com> Co-authored-by: Barry M. Caceres <barrycaceres@icloud.com>
diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml
@@ -25,22 +25,26 @@ jobs:
           dotnet-version: ${{ matrix.dotnet-version }}
 
       - name: install Senzing SDK
-        uses: senzing-factory/github-action-install-senzing-sdk@v2
+        uses: senzing-factory/github-action-install-senzing-sdk@v3
         with:
           senzingsdk-repository-path: ${{ secrets.SENZING_OSX_BETA_REPOSITORY }}
 
+      - name: configure environment
+        run: |
+          SENZING_DIR="${HOME}/senzing/er"
+          {
+            echo "SENZING_DIR=${SENZING_DIR}"
+            echo "DYLD_LIBRARY_PATH=${SENZING_DIR}/lib"
+          } >> "$GITHUB_ENV"
+
       - name: configure local nuget repo
         run: |
-          find /opt/senzing/er/sdk/dotnet/ -name "Senzing.Sdk*" | xargs -0 -L 1 basename
-          sdk_package=$(find /opt/senzing/er/sdk/dotnet/ -name "Senzing.Sdk*" | xargs -0 -L 1 basename)
+          sdk_package=$(find "${HOME}"/senzing/er/sdk/dotnet/ -name "Senzing.Sdk*" | xargs -0 -L 1 basename)
           mkdir -p ~/dev/nuget/packages
           dotnet nuget add source ~/dev/nuget/packages -n dev
-          dotnet nuget push /opt/senzing/er/sdk/dotnet/"${sdk_package}" --source dev
+          dotnet nuget push "${HOME}"/senzing/er/sdk/dotnet/"${sdk_package}" --source dev
 
       - name: run csharp snippets
-        env:
-          DYLD_LIBRARY_PATH: "/opt/senzing/er/lib"
-          SENZING_DATA_DIR: "/opt/senzing/er/data"
         run: |
           cd "${GITHUB_WORKSPACE}"/csharp/runner
           dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta
diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml
@@ -29,7 +29,7 @@ jobs:
           dotnet-version: ${{ matrix.dotnet-version }}
 
       - name: install Senzing runtime
-        uses: senzing-factory/github-action-install-senzing-sdk@v2
+        uses: senzing-factory/github-action-install-senzing-sdk@v3
         with:
           packages-to-install: "senzingsdk-runtime senzingsdk-setup"
           senzingsdk-repository-package: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_PACKAGE }}
diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml
@@ -25,26 +25,26 @@ jobs:
           dotnet-version: ${{ matrix.dotnet-version }}
 
       - name: install Senzing SDK
-        uses: senzing-factory/github-action-install-senzing-sdk@v2
+        uses: senzing-factory/github-action-install-senzing-sdk@v3
         with:
           senzingsdk-repository-path: ${{ secrets.SENZING_WIN_BETA_REPOSITORY }}
 
       - name: configure local nuget repo
         run: |
-          $Env:sdk_package = Get-ChildItem -Path "C:\Program Files\Senzing\er\sdk\dotnet\" -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name
+          $Env:sdk_package = Get-ChildItem -Path "$Env:USERPROFILE\Senzing\er\sdk\dotnet\" -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name
           mkdir $Env:USERPROFILE\dev\nuget\packages
           cd $Env:USERPROFILE\dev\nuget\packages
           dir
           dotnet nuget add source $Env:USERPROFILE\dev\nuget\packages -n senzing
-          dotnet nuget push "C:\Program Files\Senzing\er\sdk\dotnet\${Env:sdk_package}" --source senzing
+          dotnet nuget push "$Env:USERPROFILE\Senzing\er\sdk\dotnet\${Env:sdk_package}" --source senzing
           dotnet nuget list source
 
       - name: Add to "Path" environment variable
         run: |
-          Add-Content $env:GITHUB_PATH "C:\Program Files\Senzing\er\lib"
+          Add-Content $env:GITHUB_PATH "$Env:USERPROFILE\Senzing\er\lib"
 
       - name: run csharp snippets
         run: |
-          echo $Env:Path
+          $Env:SENZING_DIR = "$Env:USERPROFILE\Senzing\er"
           cd ${Env:GITHUB_WORKSPACE}/csharp/runner
           dotnet run --project SnippetRunner all
diff --git a/.github/workflows/java-darwin-snippets.yaml b/.github/workflows/java-darwin-snippets.yaml
@@ -27,20 +27,24 @@ jobs:
           java-version: ${{ matrix.java-version }}
 
       - name: install Senzing SDK
-        uses: senzing-factory/github-action-install-senzing-sdk@v2
+        uses: senzing-factory/github-action-install-senzing-sdk@v3
         with:
           senzingsdk-repository-path: ${{ secrets.SENZING_OSX_BETA_REPOSITORY }}
 
+      - name: configure environment
+        run: |
+          SENZING_DIR="${HOME}/senzing/er"
+          {
+            echo "SENZING_DIR=${SENZING_DIR}"
+            echo "DYLD_LIBRARY_PATH=${SENZING_DIR}/lib:${SENZING_DIR}/lib/macos"
+          } >> "$GITHUB_ENV"
+
       - name: build with Maven
-        env:
-          SENZING_DIR: "/opt/senzing/er"
         run: |
           cd "${GITHUB_WORKSPACE}"/java
           mvn clean install
 
       - name: run java snippets
-        env:
-          DYLD_LIBRARY_PATH: "/opt/senzing/er/lib"
         run: |
           cd "${GITHUB_WORKSPACE}"/java
           java -jar target/sz-sdk-snippets.jar all
diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml
@@ -31,7 +31,7 @@ jobs:
           distribution: ${{ matrix.java-distribution }}
 
       - name: install Senzing runtime
-        uses: senzing-factory/github-action-install-senzing-sdk@v2
+        uses: senzing-factory/github-action-install-senzing-sdk@v3
         with:
           packages-to-install: "senzingsdk-runtime senzingsdk-setup"
           senzingsdk-repository-package: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_PACKAGE }}
diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml
@@ -27,22 +27,21 @@ jobs:
           distribution: ${{ matrix.java-distribution }}
 
       - name: install Senzing SDK
-        uses: senzing-factory/github-action-install-senzing-sdk@v2
+        uses: senzing-factory/github-action-install-senzing-sdk@v3
         with:
           senzingsdk-repository-path: ${{ secrets.SENZING_WIN_BETA_REPOSITORY }}
 
       - name: build with Maven
-        env:
-          SENZING_DIR: 'C:\Program Files\Senzing\er'
         run: |
+          $Env:SENZING_DIR = "$Env:USERPROFILE\Senzing\er"
           cd "${Env:GITHUB_WORKSPACE}/java"
           mvn clean install
 
       - name: Add to "Path" environment variable
         run: |
-          Add-Content $env:GITHUB_PATH "C:\Program Files\Senzing\er\lib"
+          Add-Content $env:GITHUB_PATH "$Env:USERPROFILE\Senzing\er\lib"
 
       - name: run java snippets
         run: |
           cd "${Env:GITHUB_WORKSPACE}/java"
-          java -jar target/sz-sdk-snippets.jar all
+          java "-Dsenzing.install.dir=$Env:USERPROFILE\Senzing\er" -jar target/sz-sdk-snippets.jar all
diff --git a/csharp/runner/SnippetRunner/InstallLocations.cs b/csharp/runner/SnippetRunner/InstallLocations.cs
@@ -180,6 +180,15 @@ private static bool IsDirectory(string path)
     /// </summary>
     public static InstallLocations? FindLocations()
     {
+        DirectoryInfo homeDir = new DirectoryInfo(Environment.GetFolderPath(
+            Environment.SpecialFolder.UserProfile));
+        DirectoryInfo homeSenzing = new DirectoryInfo(
+            Path.Combine(homeDir.FullName, "senzing"));
+        DirectoryInfo homeInstall = new DirectoryInfo(
+            Path.Combine(homeSenzing.FullName, "er"));
+        DirectoryInfo homeSupport = new DirectoryInfo(
+            Path.Combine(homeInstall.FullName, "data"));
+
         DirectoryInfo? installDir = null;
         DirectoryInfo? configDir = null;
         DirectoryInfo? resourceDir = null;
@@ -190,25 +199,27 @@ private static bool IsDirectory(string path)
         string? defaultConfigPath = null;
         string defaultSupportPath;
 
-        switch (Environment.OSVersion.Platform)
+        if (OperatingSystem.IsWindows())
+        {
+            defaultInstallPath = homeInstall.FullName;
+            defaultSupportPath = homeSupport.FullName;
+        }
+        else if (OperatingSystem.IsMacOS())
         {
-            case PlatformID.Win32NT:
-                defaultInstallPath = "C:\\Program Files\\Senzing\\er";
-                defaultSupportPath = "C:\\Program Files\\Senzing\\er\\data";
-                break;
-            case PlatformID.MacOSX:
-                defaultInstallPath = "/opt/senzing/er";
-                defaultSupportPath = "/opt/senzing/er/data";
-                break;
-            case PlatformID.Unix:
-                defaultInstallPath = "/opt/senzing/er";
-                defaultConfigPath = "/etc/opt/senzing";
-                defaultSupportPath = "/opt/senzing/data";
-                break;
-            default:
-                throw new NotSupportedException(
-                    "Unsupported Operating System: "
-                    + Environment.OSVersion.Platform);
+            defaultInstallPath = homeInstall.FullName;
+            defaultSupportPath = homeSupport.FullName;
+        }
+        else if (OperatingSystem.IsLinux())
+        {
+            defaultInstallPath = "/opt/senzing/er";
+            defaultConfigPath = "/etc/opt/senzing";
+            defaultSupportPath = "/opt/senzing/data";
+        }
+        else
+        {
+            throw new NotSupportedException(
+                "Unsupported Operating System: "
+                + Environment.OSVersion.Platform);
         }
 
         // check for senzing system properties
@@ -302,22 +313,6 @@ private static bool IsDirectory(string path)
             }
             else
             {
-                switch (Environment.OSVersion.Platform)
-                {
-                    case PlatformID.Win32NT:
-                        defaultSupportPath = Path.Combine(installDir.FullName, "data");
-                        break;
-                    case PlatformID.MacOSX:
-                        defaultSupportPath = Path.Combine(installDir.FullName, "data");
-                        break;
-                    case PlatformID.Unix:
-                        break;
-                    default:
-                        throw new NotSupportedException(
-                             "Unsupported Operating System: "
-                             + Environment.OSVersion.Platform);
-                }
-
                 // no explicit path, try the default support path
                 supportDir = new DirectoryInfo(defaultSupportPath);
             }
diff --git a/java/pom.xml b/java/pom.xml
@@ -39,6 +39,7 @@
     <maven.compiler.target>17</maven.compiler.target>
     <project.build.includeEncoding>UTF-8</project.build.includeEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <senzing.install.dir>${SENZING_DIR}</senzing.install.dir>
   </properties>
   <build>
     <sourceDirectory>snippets</sourceDirectory>
diff --git a/java/runner/java/com/senzing/runner/InstallLocations.java b/java/runner/java/com/senzing/runner/InstallLocations.java
