From 56aa8995e0ed6c3cd53607f0f2252de4fbf4fdd5 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 09:56:58 -0800 Subject: [PATCH 01/59] #21 run java and chsarp snippets --- .github/workflows/csharp-darwin-snippets.yaml | 35 ++++++++++++++ .github/workflows/csharp-linux-snippets.yaml | 41 ++++++++++++++++ .../workflows/csharp-windows-snippets.yaml | 35 ++++++++++++++ .github/workflows/java-darwin-snippets.yaml | 43 +++++++++++++++++ .github/workflows/java-linux-snippets.yaml | 48 +++++++++++++++++++ .github/workflows/java-windows-snippets.yaml | 43 +++++++++++++++++ 6 files changed, 245 insertions(+) create mode 100644 .github/workflows/csharp-darwin-snippets.yaml create mode 100644 .github/workflows/csharp-linux-snippets.yaml create mode 100644 .github/workflows/csharp-windows-snippets.yaml create mode 100644 .github/workflows/java-darwin-snippets.yaml create mode 100644 .github/workflows/java-linux-snippets.yaml create mode 100644 .github/workflows/java-windows-snippets.yaml diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml new file mode 100644 index 0000000..df9c094 --- /dev/null +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -0,0 +1,35 @@ +name: csharp darwin snippets + +on: [pull_request, workflow_dispatch] + +permissions: + contents: read + pull-requests: write + +jobs: + maven-darwin: + runs-on: macos-latest + strategy: + matrix: + include: + - dotnet-version: "8" + + steps: + - name: checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: ${{ matrix.dotnet-version }} + + - name: install Senzing SDK + uses: senzing-factory/github-action-install-senzing-sdk@v2 + with: + senzingsdk-repository-path: ${{ secrets.SENZING_OSX_BETA_REPOSITORY }} + + - name: run csharp snippets + run: | + cd ${GITHUB_WORKSPACE}/csharp/runner + dotnet run --project SnippetRunner all diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml new file mode 100644 index 0000000..ef0b0cc --- /dev/null +++ b/.github/workflows/csharp-linux-snippets.yaml @@ -0,0 +1,41 @@ +name: csharp linux snippets + +on: + push: + branches-ignore: [main] + pull_request: + branches: [main] + +permissions: + contents: read + pull-requests: write + +jobs: + maven-linux: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - dotnet-version: "8" + + steps: + - name: checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: ${{ matrix.dotnet-version }} + + - name: install Senzing runtime + uses: senzing-factory/github-action-install-senzing-sdk@v2 + with: + packages-to-install: "senzingsdk-runtime senzingsdk-setup" + senzingsdk-repository-package: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_PACKAGE }} + senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} + + - name: run csharp snippets + run: | + cd ${GITHUB_WORKSPACE}/csharp/runner + dotnet run --project SnippetRunner all diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml new file mode 100644 index 0000000..44e1625 --- /dev/null +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -0,0 +1,35 @@ +name: csharp windows snippets + +on: [pull_request, workflow_dispatch] + +permissions: + contents: read + pull-requests: write + +jobs: + maven-windows: + runs-on: windows-latest + strategy: + matrix: + include: + - dotnet-version: "8" + + steps: + - name: checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: ${{ matrix.dotnet-version }} + + - name: install Senzing SDK + uses: senzing-factory/github-action-install-senzing-sdk@v2 + with: + senzingsdk-repository-path: ${{ secrets.SENZING_WIN_BETA_REPOSITORY }} + + - name: run csharp snippets + run: | + cd ${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 new file mode 100644 index 0000000..ce68b7c --- /dev/null +++ b/.github/workflows/java-darwin-snippets.yaml @@ -0,0 +1,43 @@ +name: java darwin snippets + +on: [pull_request, workflow_dispatch] + +permissions: + contents: read + pull-requests: write + +jobs: + maven-darwin: + runs-on: macos-latest + strategy: + matrix: + include: + - java-distribution: "temurin" + java-version: ["17", "21"] + senzingsdk-version: "staging-v4" + + steps: + - name: checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-java@v4 + with: + distribution: ${{ matrix.java-distribution }} + java-version: ${{ matrix.java-version }} + + - name: install Senzing SDK + uses: senzing-factory/github-action-install-senzing-sdk@v2 + with: + senzingsdk-repository-path: ${{ secrets.SENZING_OSX_BETA_REPOSITORY }} + + - name: build with Maven + run: | + cd ${GITHUB_WORKSPACE}/java + mvn clean install + + - name: run java snippets + 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 new file mode 100644 index 0000000..7598589 --- /dev/null +++ b/.github/workflows/java-linux-snippets.yaml @@ -0,0 +1,48 @@ +name: java linux snippets + +on: + push: + branches-ignore: [main] + pull_request: + branches: [main] + +permissions: + contents: read + pull-requests: write + +jobs: + maven-linux: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - java-version: ["17", "21"] + java-distribution: "temurin" + + steps: + - name: checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java-version }} + distribution: ${{ matrix.java-distribution }} + + - name: install Senzing runtime + uses: senzing-factory/github-action-install-senzing-sdk@v2 + with: + packages-to-install: "senzingsdk-runtime senzingsdk-setup" + senzingsdk-repository-package: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_PACKAGE }} + senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} + + - name: build with Maven + run: | + cd ${GITHUB_WORKSPACE}/java + mvn clean install + + - name: run java snippets + run: | + cd ${GITHUB_WORKSPACE}/java + java -jar target/sz-sdk-snippets.jar all diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml new file mode 100644 index 0000000..71fceaa --- /dev/null +++ b/.github/workflows/java-windows-snippets.yaml @@ -0,0 +1,43 @@ +name: java windows snippets + +on: [pull_request, workflow_dispatch] + +permissions: + contents: read + pull-requests: write + +jobs: + maven-windows: + runs-on: windows-latest + strategy: + matrix: + include: + - java-version: "17" + java-distribution: "temurin" + senzingsdk-version: "staging-v4" + + steps: + - name: checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java-version }} + distribution: ${{ matrix.java-distribution }} + + - name: install Senzing SDK + uses: senzing-factory/github-action-install-senzing-sdk@v2 + with: + senzingsdk-repository-path: ${{ secrets.SENZING_WIN_BETA_REPOSITORY }} + + - name: build with Maven + run: | + cd ${GITHUB_WORKSPACE}/java + mvn clean install + + - name: run java snippets + run: | + cd ${GITHUB_WORKSPACE}/java + java -jar target/sz-sdk-snippets.jar all From 314e032222d7f458acc851ca733f40a7f74fd319 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 10:09:01 -0800 Subject: [PATCH 02/59] updates --- .github/workflows/csharp-darwin-snippets.yaml | 4 ++-- .github/workflows/csharp-linux-snippets.yaml | 7 +++++-- .github/workflows/csharp-windows-snippets.yaml | 4 ++-- .github/workflows/java-darwin-snippets.yaml | 12 +++++------- .github/workflows/java-linux-snippets.yaml | 11 +++++------ .github/workflows/java-windows-snippets.yaml | 12 +++++------- 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml index df9c094..d2d9054 100644 --- a/.github/workflows/csharp-darwin-snippets.yaml +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -7,7 +7,7 @@ permissions: pull-requests: write jobs: - maven-darwin: + csharp-darwin-snippets: runs-on: macos-latest strategy: matrix: @@ -31,5 +31,5 @@ jobs: - name: run csharp snippets run: | - cd ${GITHUB_WORKSPACE}/csharp/runner + cd "${GITHUB_WORKSPACE}"/csharp/runner dotnet run --project SnippetRunner all diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml index ef0b0cc..93fa18c 100644 --- a/.github/workflows/csharp-linux-snippets.yaml +++ b/.github/workflows/csharp-linux-snippets.yaml @@ -11,7 +11,7 @@ permissions: pull-requests: write jobs: - maven-linux: + csharp-linux-snippets: runs-on: ubuntu-latest strategy: matrix: @@ -36,6 +36,9 @@ jobs: senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} - name: run csharp snippets + env: + LD_LIBRARY_PATH: "/opt/senzing/er/lib" + SENZING_DATA_DIR: "/opt/senzing/data" run: | - cd ${GITHUB_WORKSPACE}/csharp/runner + cd "${GITHUB_WORKSPACE}"/csharp/runner dotnet run --project SnippetRunner all diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 44e1625..56445eb 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -7,7 +7,7 @@ permissions: pull-requests: write jobs: - maven-windows: + csharp-windows-snippets: runs-on: windows-latest strategy: matrix: @@ -31,5 +31,5 @@ jobs: - name: run csharp snippets run: | - cd ${GITHUB_WORKSPACE}/csharp/runner + cd "${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 index ce68b7c..66459b0 100644 --- a/.github/workflows/java-darwin-snippets.yaml +++ b/.github/workflows/java-darwin-snippets.yaml @@ -7,14 +7,12 @@ permissions: pull-requests: write jobs: - maven-darwin: + java-darwin-snippets: runs-on: macos-latest strategy: matrix: - include: - - java-distribution: "temurin" - java-version: ["17", "21"] - senzingsdk-version: "staging-v4" + java-version: ["17", "21"] + java-distribution: ["temurin"] steps: - name: checkout repository @@ -34,10 +32,10 @@ jobs: - name: build with Maven run: | - cd ${GITHUB_WORKSPACE}/java + cd "${GITHUB_WORKSPACE}"/java mvn clean install - name: run java snippets run: | - cd ${GITHUB_WORKSPACE}/java + 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 index 7598589..91f2c5f 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -11,13 +11,12 @@ permissions: pull-requests: write jobs: - maven-linux: + java-linux-snippets: runs-on: ubuntu-latest strategy: matrix: - include: - - java-version: ["17", "21"] - java-distribution: "temurin" + java-version: ["17", "21"] + java-distribution: ["temurin"] steps: - name: checkout repository @@ -39,10 +38,10 @@ jobs: - name: build with Maven run: | - cd ${GITHUB_WORKSPACE}/java + cd "${GITHUB_WORKSPACE}"/java mvn clean install - name: run java snippets run: | - cd ${GITHUB_WORKSPACE}/java + cd "${GITHUB_WORKSPACE}"/java java -jar target/sz-sdk-snippets.jar all diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index 71fceaa..49ffcd8 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -7,14 +7,12 @@ permissions: pull-requests: write jobs: - maven-windows: + java-windows-snippets: runs-on: windows-latest strategy: matrix: - include: - - java-version: "17" - java-distribution: "temurin" - senzingsdk-version: "staging-v4" + java-version: ["17", "21"] + java-distribution: ["temurin"] steps: - name: checkout repository @@ -34,10 +32,10 @@ jobs: - name: build with Maven run: | - cd ${GITHUB_WORKSPACE}/java + cd "${GITHUB_WORKSPACE}"/java mvn clean install - name: run java snippets run: | - cd ${GITHUB_WORKSPACE}/java + cd "${GITHUB_WORKSPACE}"/java java -jar target/sz-sdk-snippets.jar all From a20b1043c0a40f885646caa4f700b3f043f94919 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 10:28:32 -0800 Subject: [PATCH 03/59] add senzing dir --- .github/linters/.jscpd.json | 2 +- .github/workflows/java-linux-snippets.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/linters/.jscpd.json b/.github/linters/.jscpd.json index 8665357..ebcc5ba 100644 --- a/.github/linters/.jscpd.json +++ b/.github/linters/.jscpd.json @@ -1,3 +1,3 @@ { - "threshold": 32 + "ignore": ["**/java/**","**/csharp/**","**/python/**"] } \ No newline at end of file diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index 91f2c5f..29b6e98 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -37,6 +37,8 @@ jobs: senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} - name: build with Maven + env: + SENZING_DIR: "/opt/senzing" run: | cd "${GITHUB_WORKSPACE}"/java mvn clean install From 05b428cc1e8a4b7bba6c235889113b41ce1db3f0 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 11:31:04 -0800 Subject: [PATCH 04/59] nuget updates --- .github/workflows/csharp-linux-snippets.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml index 93fa18c..eeef5c6 100644 --- a/.github/workflows/csharp-linux-snippets.yaml +++ b/.github/workflows/csharp-linux-snippets.yaml @@ -35,10 +35,17 @@ jobs: senzingsdk-repository-package: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_PACKAGE }} senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} + - name: configure local nuget repo + run: | + mkdir -p ~/dev/nuget/packages + dotnet nuget add source ~/dev/nuget/packages -n dev + dotnet nuget push /opt/senzing/er/lib/Senzing.Sdk.4.0.0-beta.1.1.nupkg --source dev + - name: run csharp snippets env: LD_LIBRARY_PATH: "/opt/senzing/er/lib" SENZING_DATA_DIR: "/opt/senzing/data" run: | cd "${GITHUB_WORKSPACE}"/csharp/runner + dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta1.1 dotnet run --project SnippetRunner all From b7dbe47a4b2253b634a055c6f82bc7a35ca12384 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 11:52:38 -0800 Subject: [PATCH 05/59] update package name --- .github/workflows/csharp-linux-snippets.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml index eeef5c6..42c1e1e 100644 --- a/.github/workflows/csharp-linux-snippets.yaml +++ b/.github/workflows/csharp-linux-snippets.yaml @@ -37,9 +37,10 @@ jobs: - name: configure local nuget repo run: | + sdk_package=$(ls /opt/senzing/er/lib/ | grep Senzing.Sdk) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev - dotnet nuget push /opt/senzing/er/lib/Senzing.Sdk.4.0.0-beta.1.1.nupkg --source dev + dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev - name: run csharp snippets env: @@ -47,5 +48,5 @@ jobs: SENZING_DATA_DIR: "/opt/senzing/data" run: | cd "${GITHUB_WORKSPACE}"/csharp/runner - dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta1.1 + dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta dotnet run --project SnippetRunner all From c334aad60c15b22fe2120e423bb6e329837b1fa7 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 12:04:28 -0800 Subject: [PATCH 06/59] fix linting, update senzing java path --- .github/workflows/csharp-linux-snippets.yaml | 2 +- .github/workflows/java-linux-snippets.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml index 42c1e1e..356076b 100644 --- a/.github/workflows/csharp-linux-snippets.yaml +++ b/.github/workflows/csharp-linux-snippets.yaml @@ -37,7 +37,7 @@ jobs: - name: configure local nuget repo run: | - sdk_package=$(ls /opt/senzing/er/lib/ | grep Senzing.Sdk) + sdk_package=$(grep -Rl "Senzing.Sdk*" /opt/senzing/er/lib/ | xargs -L 1 basename) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index 29b6e98..4222b30 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -38,7 +38,7 @@ jobs: - name: build with Maven env: - SENZING_DIR: "/opt/senzing" + SENZING_DIR: "/opt/senzing/er" run: | cd "${GITHUB_WORKSPACE}"/java mvn clean install From 52b8fa782ac1f4b3ddf7bfff8613a45f5034648c Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 12:09:22 -0800 Subject: [PATCH 07/59] add data dir to snippet run --- .github/workflows/java-linux-snippets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index 4222b30..ce9c131 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -46,4 +46,4 @@ jobs: - name: run java snippets run: | cd "${GITHUB_WORKSPACE}"/java - java -jar target/sz-sdk-snippets.jar all + java -jar target/sz-sdk-snippets.jar all -Dsenzing.support.dir=/opt/senzing From 2898442cd626b2fd87ff5ef4926498bb6887e6cb Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 13:29:43 -0800 Subject: [PATCH 08/59] fix support dir --- .github/workflows/java-linux-snippets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index ce9c131..21d2d80 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -46,4 +46,4 @@ jobs: - name: run java snippets run: | cd "${GITHUB_WORKSPACE}"/java - java -jar target/sz-sdk-snippets.jar all -Dsenzing.support.dir=/opt/senzing + java -jar target/sz-sdk-snippets.jar all -Dsenzing.support.dir="/opt/senzing/data" From 35f58a158eacc2166d77b75f8c96830147e27cde Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 13:39:03 -0800 Subject: [PATCH 09/59] test --- .github/workflows/csharp-darwin-snippets.yaml | 11 +++++++++++ .github/workflows/csharp-windows-snippets.yaml | 11 +++++++++++ .github/workflows/java-linux-snippets.yaml | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml index d2d9054..48c459c 100644 --- a/.github/workflows/csharp-darwin-snippets.yaml +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -29,7 +29,18 @@ jobs: with: senzingsdk-repository-path: ${{ secrets.SENZING_OSX_BETA_REPOSITORY }} + - name: configure local nuget repo + run: | + sdk_package=$(grep -Rl "Senzing.Sdk*" /opt/senzing/er/lib/ | xargs -L 1 basename) + mkdir -p ~/dev/nuget/packages + dotnet nuget add source ~/dev/nuget/packages -n dev + dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev + - name: run csharp snippets + env: + LD_LIBRARY_PATH: "/opt/senzing/er/lib" + SENZING_DATA_DIR: "/opt/senzing/data" run: | cd "${GITHUB_WORKSPACE}"/csharp/runner + dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta dotnet run --project SnippetRunner all diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 56445eb..583c629 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -29,7 +29,18 @@ jobs: with: senzingsdk-repository-path: ${{ secrets.SENZING_WIN_BETA_REPOSITORY }} + - name: configure local nuget repo + run: | + sdk_package=$(grep -Rl "Senzing.Sdk*" /opt/senzing/er/lib/ | xargs -L 1 basename) + mkdir -p ~/dev/nuget/packages + dotnet nuget add source ~/dev/nuget/packages -n dev + dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev + - name: run csharp snippets + env: + LD_LIBRARY_PATH: "/opt/senzing/er/lib" + SENZING_DATA_DIR: "/opt/senzing/data" run: | cd "${GITHUB_WORKSPACE}"/csharp/runner + dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta dotnet run --project SnippetRunner all diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index 21d2d80..8aa8e8a 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -41,7 +41,7 @@ jobs: SENZING_DIR: "/opt/senzing/er" run: | cd "${GITHUB_WORKSPACE}"/java - mvn clean install + mvn clean install -Dsenzing.support.dir="/opt/senzing/data" - name: run java snippets run: | From 22452a61e0470e338a8a7c59b0df61299d8aa976 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 13:56:50 -0800 Subject: [PATCH 10/59] csharp updates --- .github/workflows/csharp-darwin-snippets.yaml | 4 ++-- .github/workflows/csharp-windows-snippets.yaml | 11 +++++------ .github/workflows/java-linux-snippets.yaml | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml index 48c459c..11bbd9b 100644 --- a/.github/workflows/csharp-darwin-snippets.yaml +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -38,8 +38,8 @@ jobs: - name: run csharp snippets env: - LD_LIBRARY_PATH: "/opt/senzing/er/lib" - SENZING_DATA_DIR: "/opt/senzing/data" + 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-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 583c629..6f92d8a 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -31,15 +31,14 @@ jobs: - name: configure local nuget repo run: | - sdk_package=$(grep -Rl "Senzing.Sdk*" /opt/senzing/er/lib/ | xargs -L 1 basename) - mkdir -p ~/dev/nuget/packages - dotnet nuget add source ~/dev/nuget/packages -n dev - dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev + sdk_package=$( Get-ChildItem -Path C:\Program Files\Senzing\er\lib\ -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name) + mkdir %USERPROFILE%\dev\nuget\packages + dotnet nuget add source %USERPROFILE%\dev\nuget\packages -n dev + dotnet nuget push C:\Program Files\Senzing\er\lib\"${sdk_package}" --source dev - name: run csharp snippets env: - LD_LIBRARY_PATH: "/opt/senzing/er/lib" - SENZING_DATA_DIR: "/opt/senzing/data" + SENZING_DATA_DIR: 'C:\Program Files\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/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index 8aa8e8a..32d4793 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -41,7 +41,7 @@ jobs: SENZING_DIR: "/opt/senzing/er" run: | cd "${GITHUB_WORKSPACE}"/java - mvn clean install -Dsenzing.support.dir="/opt/senzing/data" + mvn clean install -B -Dsenzing.support.dir="/opt/senzing/data" - name: run java snippets run: | From 99b9f01af7f87e85eca94fe87701c49ccc590446 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:33:30 -0800 Subject: [PATCH 11/59] fix formatting --- .github/workflows/csharp-darwin-snippets.yaml | 2 +- .github/workflows/csharp-linux-snippets.yaml | 2 +- .github/workflows/csharp-windows-snippets.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml index 11bbd9b..b7e3e13 100644 --- a/.github/workflows/csharp-darwin-snippets.yaml +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -31,7 +31,7 @@ jobs: - name: configure local nuget repo run: | - sdk_package=$(grep -Rl "Senzing.Sdk*" /opt/senzing/er/lib/ | xargs -L 1 basename) + sdk_package=$(grep -Rl "^Senzing.Sdk" /opt/senzing/er/lib/ | xargs -L 1 basename) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml index 356076b..e2a2da1 100644 --- a/.github/workflows/csharp-linux-snippets.yaml +++ b/.github/workflows/csharp-linux-snippets.yaml @@ -37,7 +37,7 @@ jobs: - name: configure local nuget repo run: | - sdk_package=$(grep -Rl "Senzing.Sdk*" /opt/senzing/er/lib/ | xargs -L 1 basename) + sdk_package=$(grep -Rl "^Senzing.Sdk" /opt/senzing/er/lib/ | xargs -L 1 basename) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 6f92d8a..a301012 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -31,7 +31,7 @@ jobs: - name: configure local nuget repo run: | - sdk_package=$( Get-ChildItem -Path C:\Program Files\Senzing\er\lib\ -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name) + sdk_package= Get-ChildItem -Path C:\Program Files\Senzing\er\lib\ -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name mkdir %USERPROFILE%\dev\nuget\packages dotnet nuget add source %USERPROFILE%\dev\nuget\packages -n dev dotnet nuget push C:\Program Files\Senzing\er\lib\"${sdk_package}" --source dev From 3fa95b90721864f44ca01a19e67f85b8e5cde898 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:41:59 -0800 Subject: [PATCH 12/59] fixes --- .github/workflows/csharp-linux-snippets.yaml | 2 +- .github/workflows/csharp-windows-snippets.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml index e2a2da1..debb92b 100644 --- a/.github/workflows/csharp-linux-snippets.yaml +++ b/.github/workflows/csharp-linux-snippets.yaml @@ -37,7 +37,7 @@ jobs: - name: configure local nuget repo run: | - sdk_package=$(grep -Rl "^Senzing.Sdk" /opt/senzing/er/lib/ | xargs -L 1 basename) + sdk_package=$(grep -Rl "Senzing.Sdk" /opt/senzing/er/lib/ | xargs -L 1 basename) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index a301012..74244dc 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -31,10 +31,10 @@ jobs: - name: configure local nuget repo run: | - sdk_package= Get-ChildItem -Path C:\Program Files\Senzing\er\lib\ -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name + $Env:sdk_package = Get-ChildItem -Path C:\Program Files\Senzing\er\lib\ -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name mkdir %USERPROFILE%\dev\nuget\packages dotnet nuget add source %USERPROFILE%\dev\nuget\packages -n dev - dotnet nuget push C:\Program Files\Senzing\er\lib\"${sdk_package}" --source dev + dotnet nuget push C:\Program Files\Senzing\er\lib\"${Env:sdk_package}" --source dev - name: run csharp snippets env: From 2483dd3a4a6f16bff4b085243eaf87bba376476a Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 14:48:10 -0800 Subject: [PATCH 13/59] update paths --- .github/workflows/csharp-darwin-snippets.yaml | 3 ++- .github/workflows/csharp-windows-snippets.yaml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml index b7e3e13..2667b59 100644 --- a/.github/workflows/csharp-darwin-snippets.yaml +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -31,7 +31,8 @@ jobs: - name: configure local nuget repo run: | - sdk_package=$(grep -Rl "^Senzing.Sdk" /opt/senzing/er/lib/ | xargs -L 1 basename) + find /opt/senzing/er/lib/" -name "Senzing.Sdk*" | xargs -L 1 basename + sdk_package=$(find /opt/senzing/er/lib/" -name "Senzing.Sdk*" | xargs -L 1 basename) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 74244dc..6707241 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -31,10 +31,10 @@ jobs: - name: configure local nuget repo run: | - $Env:sdk_package = Get-ChildItem -Path C:\Program Files\Senzing\er\lib\ -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name + $Env:sdk_package = Get-ChildItem -Path "C:\Program Files\Senzing\er\lib\" -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name mkdir %USERPROFILE%\dev\nuget\packages dotnet nuget add source %USERPROFILE%\dev\nuget\packages -n dev - dotnet nuget push C:\Program Files\Senzing\er\lib\"${Env:sdk_package}" --source dev + dotnet nuget push "C:\Program Files\Senzing\er\lib\${Env:sdk_package}" --source dev - name: run csharp snippets env: From 4868eabe73f91f80230847fc865211d92de3ee3c Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 20 Feb 2025 16:54:15 -0800 Subject: [PATCH 14/59] fix typo --- .github/workflows/csharp-darwin-snippets.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml index 2667b59..34745d2 100644 --- a/.github/workflows/csharp-darwin-snippets.yaml +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -31,8 +31,8 @@ jobs: - name: configure local nuget repo run: | - find /opt/senzing/er/lib/" -name "Senzing.Sdk*" | xargs -L 1 basename - sdk_package=$(find /opt/senzing/er/lib/" -name "Senzing.Sdk*" | xargs -L 1 basename) + find /opt/senzing/er/lib/ -name "Senzing.Sdk*" | xargs -L 1 basename + sdk_package=$(find /opt/senzing/er/lib/ -name "Senzing.Sdk*" | xargs -L 1 basename) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev From 3fc8f22fc4e48ddc7783e42182580b6c08efa7df Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 08:20:02 -0800 Subject: [PATCH 15/59] update java paths --- .github/workflows/csharp-darwin-snippets.yaml | 2 +- .github/workflows/java-darwin-snippets.yaml | 2 ++ .github/workflows/java-windows-snippets.yaml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml index 34745d2..6698b13 100644 --- a/.github/workflows/csharp-darwin-snippets.yaml +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -31,7 +31,7 @@ jobs: - name: configure local nuget repo run: | - find /opt/senzing/er/lib/ -name "Senzing.Sdk*" | xargs -L 1 basename + find /opt/senzing/er/lib/ -name "Senzing.Sdk*" | xargs -0 -L 1 basename sdk_package=$(find /opt/senzing/er/lib/ -name "Senzing.Sdk*" | xargs -L 1 basename) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev diff --git a/.github/workflows/java-darwin-snippets.yaml b/.github/workflows/java-darwin-snippets.yaml index 66459b0..b8fc926 100644 --- a/.github/workflows/java-darwin-snippets.yaml +++ b/.github/workflows/java-darwin-snippets.yaml @@ -31,6 +31,8 @@ jobs: senzingsdk-repository-path: ${{ secrets.SENZING_OSX_BETA_REPOSITORY }} - name: build with Maven + env: + SENZING_DIR: "/opt/senzing/er" run: | cd "${GITHUB_WORKSPACE}"/java mvn clean install diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index 49ffcd8..bd16c6c 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -32,10 +32,10 @@ jobs: - name: build with Maven run: | - cd "${GITHUB_WORKSPACE}"/java + cd "${GITHUB_WORKSPACE}"\java mvn clean install - name: run java snippets run: | - cd "${GITHUB_WORKSPACE}"/java + cd "${GITHUB_WORKSPACE}"\java java -jar target/sz-sdk-snippets.jar all From f1f60d0ccf72b83afc8b3710521e662e824c463d Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 08:29:39 -0800 Subject: [PATCH 16/59] update lib path, fix windows var --- .github/workflows/csharp-darwin-snippets.yaml | 2 +- .github/workflows/csharp-windows-snippets.yaml | 2 +- .github/workflows/java-darwin-snippets.yaml | 2 ++ .github/workflows/java-windows-snippets.yaml | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml index 6698b13..4d46d43 100644 --- a/.github/workflows/csharp-darwin-snippets.yaml +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -32,7 +32,7 @@ jobs: - name: configure local nuget repo run: | find /opt/senzing/er/lib/ -name "Senzing.Sdk*" | xargs -0 -L 1 basename - sdk_package=$(find /opt/senzing/er/lib/ -name "Senzing.Sdk*" | xargs -L 1 basename) + sdk_package=$(find /opt/senzing/er/lib/ -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/lib/"${sdk_package}" --source dev diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 6707241..b01c2f6 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -40,6 +40,6 @@ jobs: env: SENZING_DATA_DIR: 'C:\Program Files\Senzing\er\data' run: | - cd "${GITHUB_WORKSPACE}"/csharp/runner + cd "${$Env:GITHUB_WORKSPACE}"/csharp/runner dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta dotnet run --project SnippetRunner all diff --git a/.github/workflows/java-darwin-snippets.yaml b/.github/workflows/java-darwin-snippets.yaml index b8fc926..df418de 100644 --- a/.github/workflows/java-darwin-snippets.yaml +++ b/.github/workflows/java-darwin-snippets.yaml @@ -38,6 +38,8 @@ jobs: 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-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index bd16c6c..4394009 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -32,10 +32,10 @@ jobs: - name: build with Maven run: | - cd "${GITHUB_WORKSPACE}"\java + cd "${$Env:GITHUB_WORKSPACE}"\java mvn clean install - name: run java snippets run: | - cd "${GITHUB_WORKSPACE}"\java + cd "${$Env:GITHUB_WORKSPACE}"\java java -jar target/sz-sdk-snippets.jar all From 03b0f970e2ded062ce0f1f32dc9b19d73058dcf3 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 08:38:15 -0800 Subject: [PATCH 17/59] sanity check --- .github/workflows/java-windows-snippets.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index 4394009..e87163b 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -32,10 +32,10 @@ jobs: - name: build with Maven run: | - cd "${$Env:GITHUB_WORKSPACE}"\java + cd "${$Env:GITHUB_WORKSPACE}/java" mvn clean install - name: run java snippets run: | - cd "${$Env:GITHUB_WORKSPACE}"\java + cd "${$Env:GITHUB_WORKSPACE}/java" java -jar target/sz-sdk-snippets.jar all From f27e1ad1ceb4d41154313255e28d3a7a134f543f Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 08:48:40 -0800 Subject: [PATCH 18/59] fix typo --- .github/workflows/csharp-windows-snippets.yaml | 2 +- .github/workflows/java-windows-snippets.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index b01c2f6..a6fb518 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -40,6 +40,6 @@ jobs: env: SENZING_DATA_DIR: 'C:\Program Files\Senzing\er\data' run: | - cd "${$Env:GITHUB_WORKSPACE}"/csharp/runner + cd "${Env:GITHUB_WORKSPACE}"/csharp/runner dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta dotnet run --project SnippetRunner all diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index e87163b..ceac589 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -32,10 +32,10 @@ jobs: - name: build with Maven run: | - cd "${$Env:GITHUB_WORKSPACE}/java" + cd "${Env:GITHUB_WORKSPACE}/java" mvn clean install - name: run java snippets run: | - cd "${$Env:GITHUB_WORKSPACE}/java" + cd "${Env:GITHUB_WORKSPACE}/java" java -jar target/sz-sdk-snippets.jar all From a37dd7ae12c49149bcf13872b65192645d20c5dc Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 08:55:47 -0800 Subject: [PATCH 19/59] add senzing dir for windows --- .github/workflows/java-windows-snippets.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index ceac589..aa57418 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -31,6 +31,8 @@ jobs: senzingsdk-repository-path: ${{ secrets.SENZING_WIN_BETA_REPOSITORY }} - name: build with Maven + env: + SENZING_DIR: 'C:\Program Files\Senzing\er' run: | cd "${Env:GITHUB_WORKSPACE}/java" mvn clean install From 1b5ee549fab892d25521cdf8a8852a26857fff51 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 09:02:46 -0800 Subject: [PATCH 20/59] update windows path --- .github/workflows/java-windows-snippets.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index aa57418..ae499d9 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -39,5 +39,6 @@ jobs: - name: run java snippets run: | + Add-Content $env:GITHUB_PATH 'C:\Program Files\Senzing\er\lib' cd "${Env:GITHUB_WORKSPACE}/java" java -jar target/sz-sdk-snippets.jar all From caccfaee427f55a7770cbec9f62d5410fe4772b3 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 09:08:48 -0800 Subject: [PATCH 21/59] update ld library path --- .github/workflows/java-windows-snippets.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index ae499d9..606bc85 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -38,6 +38,8 @@ jobs: mvn clean install - name: run java snippets + env: + LD_LIBRARY_PATH: 'C:\Program Files\Senzing\er\lib' run: | Add-Content $env:GITHUB_PATH 'C:\Program Files\Senzing\er\lib' cd "${Env:GITHUB_WORKSPACE}/java" From 301f4552848b1347f5a1c36f5ad802735c880bd4 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 09:14:32 -0800 Subject: [PATCH 22/59] update path in separate step --- .github/workflows/java-windows-snippets.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index 606bc85..ce9c241 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -37,10 +37,11 @@ jobs: 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" + - name: run java snippets - env: - LD_LIBRARY_PATH: 'C:\Program Files\Senzing\er\lib' run: | - Add-Content $env:GITHUB_PATH 'C:\Program Files\Senzing\er\lib' cd "${Env:GITHUB_WORKSPACE}/java" java -jar target/sz-sdk-snippets.jar all From 00f2e1651fc3d9eca287c3db35afe11747bbb082 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 10:34:06 -0800 Subject: [PATCH 23/59] Updated finding of default support path --- .../runner/SnippetRunner/InstallLocations.cs | 148 ++---------------- .../com/senzing/runner/InstallLocations.java | 72 ++------- 2 files changed, 30 insertions(+), 190 deletions(-) diff --git a/csharp/runner/SnippetRunner/InstallLocations.cs b/csharp/runner/SnippetRunner/InstallLocations.cs index dd3bb60..f441c9f 100644 --- a/csharp/runner/SnippetRunner/InstallLocations.cs +++ b/csharp/runner/SnippetRunner/InstallLocations.cs @@ -188,46 +188,22 @@ private static bool IsDirectory(string path) string defaultInstallPath; string? defaultConfigPath = null; - - // check if we are building within the dev structure - string[] directoryStructure = ["net8.0", "*", "bin", "Senzing.Sdk.Tests", "sz-sdk-csharp", "csharp", "g2", "apps", "dev"]; - DirectoryInfo? workingDir = new DirectoryInfo(Environment.CurrentDirectory); - DirectoryInfo? previousDir = null; - bool devStructure = true; - foreach (var dirName in directoryStructure) - { - if (workingDir == null) break; - if (!dirName.Equals("*", OrdinalIgnoreCase) && !workingDir.Name.Equals(dirName, OrdinalIgnoreCase)) - { - devStructure = false; - break; - } - previousDir = workingDir; - workingDir = workingDir.Parent; - } - DirectoryInfo? devDistDir = (devStructure && previousDir != null) - ? new DirectoryInfo(Path.Combine(previousDir.FullName, "dist")) : null; + string defaultSupportPath; switch (Environment.OSVersion.Platform) { case PlatformID.Win32NT: - defaultInstallPath = (devDistDir == null) - ? "C:\\Program Files\\Senzing\\er" : devDistDir.FullName; + defaultInstallPath = "C:\\Program Files\\Senzing\\er"; + defaultSupportPath = "C:\\Program Files\\Senzing\\er\\data"; break; case PlatformID.MacOSX: - defaultInstallPath = (devDistDir == null) - ? "/opt/senzing/er" : devDistDir.FullName; + defaultInstallPath = "/opt/senzing/er"; + defaultSupportPath = "/opt/senzing/er/data"; break; case PlatformID.Unix: - if (devDistDir == null) - { - defaultInstallPath = "/opt/senzing/er"; - defaultConfigPath = "/etc/opt/senzing"; - } - else - { - defaultInstallPath = devDistDir.FullName; - } + defaultInstallPath = "/opt/senzing/er"; + defaultConfigPath = "/etc/opt/senzing"; + defaultSupportPath = "/opt/senzing/data"; break; default: throw new NotSupportedException( @@ -314,109 +290,19 @@ private static bool IsDirectory(string path) return null; } - if (supportPath == null || supportPath.Trim().Length == 0) - { - // try to determine the support path - DirectoryInfo? installParent = installDir.Parent; - DirectoryInfo? dataRoot = (installParent != null) - ? new DirectoryInfo(Path.Combine(installParent.FullName, "data")) - : null; - - if (dataRoot != null && dataRoot.Exists && IsDirectory(dataRoot.FullName)) - { - DirectoryInfo? versionFile - = new DirectoryInfo( - Path.Combine(installDir.FullName, "szBuildVersion.json")); - - string? dataVersion = null; - if (versionFile != null && versionFile.Exists) - { - - String text = File.ReadAllText(versionFile.FullName, UTF8); - JsonDocument jsonDoc = JsonDocument.Parse(text); - JsonElement rootElem = jsonDoc.RootElement; - JsonElement dataVerElem = rootElem.GetProperty("DATA_VERSION"); - dataVersion = dataVerElem.GetString(); - } - - // try the data version directory - supportDir = (dataVersion == null) - ? null - : new DirectoryInfo( - Path.Combine(dataRoot.FullName, dataVersion.Trim())); - - // check if data version was not found - if (supportDir == null || !supportDir.Exists) - { - Regex regex = new Regex("\\d+\\.\\d+\\.\\d+"); - // look to see if we only have one data version installed - string[] dirs = Directory.GetDirectories(dataRoot.FullName); - List versionDirs - = new List(); - foreach (string dir in dirs) - { - DirectoryInfo versionDir = new DirectoryInfo(dir); - if (!regex.IsMatch(versionDir.Name)) continue; - versionDirs.Add(versionDir); - } - if (versionDirs.Count == 1 && supportDir == null) - { - // use the single data version found - supportDir = versionDirs[0]; - } - else if (versionDirs.Count > 1) - { - Console.Error.WriteLine( - "Could not infer support directory. Multiple data " - + "directory versions at: "); - Console.Error.WriteLine(" " + dataRoot); - if (supportDir != null) - { - Console.Error.WriteLine(); - Console.Error.WriteLine("Expected to find: " + supportDir); - } - throw new InvalidOperationException( - ((supportDir == null) - ? "Could not infer support directory." - : "Could not find support directory (" + supportDir + ").") - + " Multiple data directory versions found at: " - + dataRoot); - } - else - { - // no version directories were found, maybe the data root is - // the actual support directory (mapped in a docker image) - string[] files = Directory.GetFiles(dataRoot.FullName); - List ibmFiles = new List(); - foreach (string file in files) - { - if (file.EndsWith(".ibm", OrdinalIgnoreCase)) - { - ibmFiles.Add(new FileInfo(file)); - } - } - DirectoryInfo? libPostalDir = new DirectoryInfo( - Path.Combine(dataRoot.FullName, "libpostal")); - - // require the .ibm files and libpostal to exist - if (ibmFiles.Count > 0 && libPostalDir.Exists) - { - supportDir = dataRoot; - } - } - } - - } - if (supportDir == null) - { - // use the default path + // check if an explicit support path has been specified + if (supportPath == null || supportPath.Trim().Length == 0) { + // check if using a dev build + if ("dist".Equals(installDir.Name, OrdinalIgnoreCase)) { + // use the "data" sub-directory of the dev build supportDir = new DirectoryInfo( Path.Combine(installDir.FullName, "data")); + } else { + // no explicit path, try the default support path + supportDir = new DirectoryInfo(defaultSupportPath); } - } - else - { + } else { // use the specified explicit path supportDir = new DirectoryInfo(supportPath); } diff --git a/java/runner/java/com/senzing/runner/InstallLocations.java b/java/runner/java/com/senzing/runner/InstallLocations.java index 63fcd51..8612eb2 100644 --- a/java/runner/java/com/senzing/runner/InstallLocations.java +++ b/java/runner/java/com/senzing/runner/InstallLocations.java @@ -165,14 +165,18 @@ public static InstallLocations findLocations() { try { String defaultInstallPath; String defaultConfigPath = null; + String defaultSupportPath = null; if (windows) { - defaultInstallPath = "C:\\\\Program Files\\Senzing\\er"; + defaultInstallPath = "C:\\Program Files\\Senzing\\er"; + defaultSupportPath = "C:\\Program Files\\Senzing\\er\\data"; } else if (macOS) { defaultInstallPath = "/opt/senzing/er"; + defaultSupportPath = "/opt/senzing/er/data"; } else { defaultInstallPath = "/opt/senzing/er"; - defaultConfigPath = "/etc/opt/senzing"; + defaultConfigPath = "/etc/opt/senzing"; + defaultSupportPath = "/opt/senzing/data"; } // set the install path if one has been provided @@ -249,65 +253,15 @@ public static InstallLocations findLocations() { return null; } + // check if an explicit support path has been specified if (supportPath == null || supportPath.trim().length() == 0) { - // try to determine the support path - File installParent = installDir.getParentFile(); - File dataRoot = new File(installParent, "data"); - if (dataRoot.exists() && dataRoot.isDirectory()) { - File versionFile = new File(installDir, "szBuildVersion.json"); - String dataVersion = null; - if (versionFile.exists()) { - String text = readTextFileAsString(versionFile, UTF_8); - JsonObject jsonObject = parseJsonObject(text); - dataVersion = (jsonObject.containsKey("DATA_VERSION") - ? jsonObject.getString("DATA_VERSION") : null); - } - - // try the data version directory - supportDir = (dataVersion == null) ? null : new File(dataRoot, dataVersion.trim()); - - // check if data version was not found - if (supportDir == null || !supportDir.exists()) { - // look to see if we only have one data version installed - File[] versionDirs = dataRoot.listFiles(f -> { - return f.getName().matches("\\d+\\.\\d+\\.\\d+"); - }); - if (versionDirs.length == 1 && supportDir == null) { - // use the single data version found - supportDir = versionDirs[0]; - - } else if (versionDirs.length > 1) { - System.err.println( - "Could not infer support directory. Multiple data " - + "directory versions at: "); - System.err.println(" " + dataRoot); - if (supportDir != null) { - System.err.println(); - System.err.println("Expected to find: " + supportDir); - } - throw new IllegalStateException( - ((supportDir == null) ? "Could not infer support directory." - : "Could not find support directory (" + supportDir + ").") - + " Multiple data directory versions found at: " + dataRoot); - } else { - // no version directories were found, maybe the data root is - // the actual support directory (mapped in a docker image) - File[] ibmFiles = dataRoot.listFiles(f -> { - return f.getName().toLowerCase().endsWith(".ibm"); - }); - File libPostalDir = new File(dataRoot, "libpostal"); - - // require the .ibm files and libpostal to exist - if (ibmFiles.length > 0 && libPostalDir.exists()) { - supportDir = dataRoot; - } - } - } - - } - if (supportDir == null) { - // use the default path + // check if using a dev build + if ("dist".equals(installDir.getName())) { + // use the "data" sub-directory of the dev build supportDir = new File(installDir, "data"); + } else { + // no explicit path, try the default support path + supportDir = new File(defaultSupportPath); } } else { From 3f5595a424c18f11de9b819dc12b96d4ead7ec11 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 10:40:07 -0800 Subject: [PATCH 24/59] Formatted InstallLocations.cs and removed -D option from Java workflow --- .github/workflows/java-linux-snippets.yaml | 4 ++-- .../runner/SnippetRunner/InstallLocations.cs | 20 ++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index 32d4793..4ee22fa 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -41,9 +41,9 @@ jobs: SENZING_DIR: "/opt/senzing/er" run: | cd "${GITHUB_WORKSPACE}"/java - mvn clean install -B -Dsenzing.support.dir="/opt/senzing/data" + mvn clean package - name: run java snippets run: | cd "${GITHUB_WORKSPACE}"/java - java -jar target/sz-sdk-snippets.jar all -Dsenzing.support.dir="/opt/senzing/data" + java -jar target/sz-sdk-snippets.jar all diff --git a/csharp/runner/SnippetRunner/InstallLocations.cs b/csharp/runner/SnippetRunner/InstallLocations.cs index f441c9f..cb93f8c 100644 --- a/csharp/runner/SnippetRunner/InstallLocations.cs +++ b/csharp/runner/SnippetRunner/InstallLocations.cs @@ -201,9 +201,9 @@ private static bool IsDirectory(string path) defaultSupportPath = "/opt/senzing/er/data"; break; case PlatformID.Unix: - defaultInstallPath = "/opt/senzing/er"; - defaultConfigPath = "/etc/opt/senzing"; - defaultSupportPath = "/opt/senzing/data"; + defaultInstallPath = "/opt/senzing/er"; + defaultConfigPath = "/etc/opt/senzing"; + defaultSupportPath = "/opt/senzing/data"; break; default: throw new NotSupportedException( @@ -291,18 +291,24 @@ private static bool IsDirectory(string path) } // check if an explicit support path has been specified - if (supportPath == null || supportPath.Trim().Length == 0) { + if (supportPath == null || supportPath.Trim().Length == 0) + { // check if using a dev build - if ("dist".Equals(installDir.Name, OrdinalIgnoreCase)) { + if ("dist".Equals(installDir.Name, OrdinalIgnoreCase)) + { // use the "data" sub-directory of the dev build supportDir = new DirectoryInfo( Path.Combine(installDir.FullName, "data")); - } else { + } + else + { // no explicit path, try the default support path supportDir = new DirectoryInfo(defaultSupportPath); } - } else { + } + else + { // use the specified explicit path supportDir = new DirectoryInfo(supportPath); } From 22561ae7ca8d2bf1888b36d26ee36734f8a766b0 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 10:44:43 -0800 Subject: [PATCH 25/59] Added LD_LIBRARY_PATH for Java runner --- .github/workflows/java-linux-snippets.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index 4ee22fa..9fbc367 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -44,6 +44,8 @@ jobs: mvn clean package - name: run java snippets + env: + LD_LIBRARY_PATH: "/opt/senzing/er/lib:${LD_LIBRARY_PATH}" run: | cd "${GITHUB_WORKSPACE}"/java java -jar target/sz-sdk-snippets.jar all From 8de8f7c2ca5669b42c022cdc897fc1bbbfeb46c0 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 11:28:56 -0800 Subject: [PATCH 26/59] Removed SENZING_DIR env variable since using the defaults --- .github/workflows/csharp-linux-snippets.yaml | 1 - .github/workflows/java-linux-snippets.yaml | 2 -- 2 files changed, 3 deletions(-) diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml index debb92b..30f0e50 100644 --- a/.github/workflows/csharp-linux-snippets.yaml +++ b/.github/workflows/csharp-linux-snippets.yaml @@ -45,7 +45,6 @@ jobs: - name: run csharp snippets env: LD_LIBRARY_PATH: "/opt/senzing/er/lib" - SENZING_DATA_DIR: "/opt/senzing/data" run: | cd "${GITHUB_WORKSPACE}"/csharp/runner dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index 9fbc367..c522582 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -37,8 +37,6 @@ jobs: senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} - name: build with Maven - env: - SENZING_DIR: "/opt/senzing/er" run: | cd "${GITHUB_WORKSPACE}"/java mvn clean package From 52ebfd3dd8f4f01de3b0c24763bc44befdb26bfc Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 11:31:01 -0800 Subject: [PATCH 27/59] turn off fail fast --- .github/workflows/java-darwin-snippets.yaml | 1 + .github/workflows/java-linux-snippets.yaml | 1 + .github/workflows/java-windows-snippets.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/java-darwin-snippets.yaml b/.github/workflows/java-darwin-snippets.yaml index df418de..d946e8e 100644 --- a/.github/workflows/java-darwin-snippets.yaml +++ b/.github/workflows/java-darwin-snippets.yaml @@ -10,6 +10,7 @@ jobs: java-darwin-snippets: runs-on: macos-latest strategy: + fail-fast: false matrix: java-version: ["17", "21"] java-distribution: ["temurin"] diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index c522582..01b4f1f 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -14,6 +14,7 @@ jobs: java-linux-snippets: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java-version: ["17", "21"] java-distribution: ["temurin"] diff --git a/.github/workflows/java-windows-snippets.yaml b/.github/workflows/java-windows-snippets.yaml index ce9c241..cef76ab 100644 --- a/.github/workflows/java-windows-snippets.yaml +++ b/.github/workflows/java-windows-snippets.yaml @@ -10,6 +10,7 @@ jobs: java-windows-snippets: runs-on: windows-latest strategy: + fail-fast: false matrix: java-version: ["17", "21"] java-distribution: ["temurin"] From 8a9d12f70f091d03d07e907d87452368c479c24d Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 11:35:35 -0800 Subject: [PATCH 28/59] Restored SENZING_DIR env variable as pom.xml uses it --- .github/workflows/java-linux-snippets.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/java-linux-snippets.yaml b/.github/workflows/java-linux-snippets.yaml index c522582..9fbc367 100644 --- a/.github/workflows/java-linux-snippets.yaml +++ b/.github/workflows/java-linux-snippets.yaml @@ -37,6 +37,8 @@ jobs: senzingsdk-repository-path: ${{ secrets.SENZING_APT_BETA_STAGING_REPOSITORY_URL }} - name: build with Maven + env: + SENZING_DIR: "/opt/senzing/er" run: | cd "${GITHUB_WORKSPACE}"/java mvn clean package From bb4067ae7366430c8211d6cc7b9d21a2ce9fe659 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 11:54:49 -0800 Subject: [PATCH 29/59] Tried fixing database URL file path separators --- java/README.md | 20 +++++++++++++++++++ .../com/senzing/runner/SnippetRunner.java | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/java/README.md b/java/README.md index d5efc1a..f47b23e 100644 --- a/java/README.md +++ b/java/README.md @@ -6,6 +6,26 @@ The Java snippets are contained in the `snippets` directory under various Java p The Java snippets can built using the `pom.xml` in this directory using `mvn package`. The result will be the `sz-sdk-snippets.jar` file in the `target` directory. +1. First, set the `SENZING_DIR` environment variable so the `pom.xml` can locate +the `sz-sdk.jar`. + - Linux/macOS: + + ```console + export SENZING_DIR=/opt/senzing/er + ``` + + - Windows: + + ```console + set SENZING_DIR=C:\Program Files\Senzing\er + ``` + +1. Run the maven build: + + ```console + mvn package + ``` + ## Running There are several ways to run the code snippets. diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java index 92a42b9..d28523d 100644 --- a/java/runner/java/com/senzing/runner/SnippetRunner.java +++ b/java/runner/java/com/senzing/runner/SnippetRunner.java @@ -475,7 +475,7 @@ private static String setupTempRepository(InstallLocations senzingInstall) throw String supportPath = senzingInstall.getSupportDirectory().getCanonicalPath(); String configPath = configDir.getCanonicalPath(); String resourcePath = resourcesDir.toString(); - String databasePath = databaseFile.getCanonicalPath(); + String databasePath = databaseFile.getCanonicalPath().replace('\\','/'); String baseConfig = readTextFileAsString(configFile, UTF_8); String settings = """ { From b89694321913e55edf9a0a12897271faa67d716f Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 12:04:40 -0800 Subject: [PATCH 30/59] Debug Senzing settings on Windows --- java/runner/java/com/senzing/runner/SnippetRunner.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java index d28523d..b9c1627 100644 --- a/java/runner/java/com/senzing/runner/SnippetRunner.java +++ b/java/runner/java/com/senzing/runner/SnippetRunner.java @@ -497,6 +497,10 @@ private static String setupTempRepository(InstallLocations senzingInstall) throw long configId = configMgr.addConfig(baseConfig, "Default Config"); configMgr.setDefaultConfigId(configId); + } catch (SzException e) { + System.err.println(settings); + throw e; + } finally { env.destroy(); } From b3f17f5194df96b5e5d8b14748827cdcba1c29d9 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 12:11:36 -0800 Subject: [PATCH 31/59] Attempt to fix windows issues with init JSON --- java/runner/java/com/senzing/runner/SnippetRunner.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java index b9c1627..5195335 100644 --- a/java/runner/java/com/senzing/runner/SnippetRunner.java +++ b/java/runner/java/com/senzing/runner/SnippetRunner.java @@ -472,9 +472,9 @@ private static String setupTempRepository(InstallLocations senzingInstall) throw } } - String supportPath = senzingInstall.getSupportDirectory().getCanonicalPath(); - String configPath = configDir.getCanonicalPath(); - String resourcePath = resourcesDir.toString(); + String supportPath = senzingInstall.getSupportDirectory().getCanonicalPath().replace("\\", "\\\\"); + String configPath = configDir.getCanonicalPath().replace("\\", "\\\\"); + String resourcePath = resourcesDir.toString().replace("\\", "\\\\"); String databasePath = databaseFile.getCanonicalPath().replace('\\','/'); String baseConfig = readTextFileAsString(configFile, UTF_8); String settings = """ @@ -500,7 +500,7 @@ private static String setupTempRepository(InstallLocations senzingInstall) throw } catch (SzException e) { System.err.println(settings); throw e; - + } finally { env.destroy(); } From edb1eb27b452f4527c915f1040518c922364d6c9 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 12:16:46 -0800 Subject: [PATCH 32/59] Attempt to fix windows issues with init JSON --- java/runner/java/com/senzing/runner/SnippetRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java index 5195335..d003d68 100644 --- a/java/runner/java/com/senzing/runner/SnippetRunner.java +++ b/java/runner/java/com/senzing/runner/SnippetRunner.java @@ -475,7 +475,7 @@ private static String setupTempRepository(InstallLocations senzingInstall) throw String supportPath = senzingInstall.getSupportDirectory().getCanonicalPath().replace("\\", "\\\\"); String configPath = configDir.getCanonicalPath().replace("\\", "\\\\"); String resourcePath = resourcesDir.toString().replace("\\", "\\\\"); - String databasePath = databaseFile.getCanonicalPath().replace('\\','/'); + String databasePath = databaseFile.getCanonicalPath().replace("\\", "\\\\"); String baseConfig = readTextFileAsString(configFile, UTF_8); String settings = """ { From 2ea806a919615d8f902fa00fed93149f4175e24e Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 13:25:33 -0800 Subject: [PATCH 33/59] Debug windows failure to kill sub-process --- java/runner/java/com/senzing/runner/SnippetRunner.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java index d003d68..e230018 100644 --- a/java/runner/java/com/senzing/runner/SnippetRunner.java +++ b/java/runner/java/com/senzing/runner/SnippetRunner.java @@ -322,7 +322,11 @@ private static void executeSnippet(String snippet, // NOTE: using process.destroy() does not trigger the registered // shutdown hooks in the snippet sub-process for some reason Process killer = runtime.exec("kill " + process.pid()); + Thread killerr = startOutputThread(killer.getErrorStream(), System.err); + Thread killout = startOutputThread(killer.getInputStream(), System.out); killer.waitFor(); // wait for the kill process to complete + killerr.join(); + killout.join(); } exitValue = process.waitFor(); From 9715930bf22d71d323b0444ac6684e3515a2d6e7 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 13:57:10 -0800 Subject: [PATCH 34/59] Attempted fix for windows killing subprocess --- .../com/senzing/runner/SnippetRunner.java | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java index e230018..ed4db52 100644 --- a/java/runner/java/com/senzing/runner/SnippetRunner.java +++ b/java/runner/java/com/senzing/runner/SnippetRunner.java @@ -35,6 +35,26 @@ public class SnippetRunner { private static final int SIGTERM_EXIT_CODE = 143; + private static final boolean WINDOWS; + private static final boolean MACOS; + + static { + final String osName = System.getProperty("os.name"); + + boolean windows = false; + boolean macOS = false; + + String lowerOSName = osName.toLowerCase().trim(); + if (lowerOSName.startsWith("windows")) { + windows = true; + } else if (lowerOSName.startsWith("mac") || lowerOSName.indexOf("darwin") >= 0) { + macOS = true; + } + + WINDOWS = windows; + MACOS = macOS; + } + /** * Harness for running one or more of the code snippets. * @@ -321,7 +341,8 @@ private static void executeSnippet(String snippet, System.out.println("Runner destroying " + snippet + " process..."); // NOTE: using process.destroy() does not trigger the registered // shutdown hooks in the snippet sub-process for some reason - Process killer = runtime.exec("kill " + process.pid()); + Process killer = runtime.exec( + ((WINDOWS) ? "taskkill /F /PID " : "kill ") + process.pid()); Thread killerr = startOutputThread(killer.getErrorStream(), System.err); Thread killout = startOutputThread(killer.getInputStream(), System.out); killer.waitFor(); // wait for the kill process to complete @@ -377,27 +398,15 @@ private static void printUsage(SortedMap> snippetMap) private static String getJarPath() throws RuntimeException { try { - final String osName = System.getProperty("os.name"); - - boolean windows = false; - boolean macOS = false; - - String lowerOSName = osName.toLowerCase().trim(); - if (lowerOSName.startsWith("windows")) { - windows = true; - } else if (lowerOSName.startsWith("mac") || lowerOSName.indexOf("darwin") >= 0) { - macOS = true; - } - String resourceName = SnippetRunner.class.getSimpleName() + ".class"; String url = SnippetRunner.class.getResource(resourceName).toString(); String jarPath = url.replaceAll("jar:file:(.*\\.jar)\\!/.*\\.class", "$1"); - if (windows && jarPath.startsWith("/")) { + if (WINDOWS && jarPath.startsWith("/")) { jarPath = jarPath.replaceAll("[/]+([^/].*)", "$1"); } - if (windows && jarPath.startsWith("/")) { + if (WINDOWS && jarPath.startsWith("/")) { jarPath = jarPath.substring(1); } return jarPath; From b28a623341fcc4046abf0185ed31b9545f80a69e Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 13:57:57 -0800 Subject: [PATCH 35/59] Attempted fix for windows killing subprocess --- java/runner/java/com/senzing/runner/SnippetRunner.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java index ed4db52..c925983 100644 --- a/java/runner/java/com/senzing/runner/SnippetRunner.java +++ b/java/runner/java/com/senzing/runner/SnippetRunner.java @@ -343,11 +343,7 @@ private static void executeSnippet(String snippet, // shutdown hooks in the snippet sub-process for some reason Process killer = runtime.exec( ((WINDOWS) ? "taskkill /F /PID " : "kill ") + process.pid()); - Thread killerr = startOutputThread(killer.getErrorStream(), System.err); - Thread killout = startOutputThread(killer.getInputStream(), System.out); killer.waitFor(); // wait for the kill process to complete - killerr.join(); - killout.join(); } exitValue = process.waitFor(); From 8fe573a8d150e6a781a3947efd501e92c5811b42 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 14:09:27 -0800 Subject: [PATCH 36/59] Increased auto-kill time for continuous snippets --- java/runner/resources/redo/RedoContinuous.properties | 2 +- java/runner/resources/redo/RedoContinuousViaFutures.properties | 2 +- java/runner/resources/redo/RedoWithInfoContinuous.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/runner/resources/redo/RedoContinuous.properties b/java/runner/resources/redo/RedoContinuous.properties index 16be70f..280d48b 100644 --- a/java/runner/resources/redo/RedoContinuous.properties +++ b/java/runner/resources/redo/RedoContinuous.properties @@ -4,4 +4,4 @@ source.2=REFERENCE load.0=/data/truthset/customers.jsonl load.1=/data/truthset/reference.jsonl load.2=/data/truthset/watchlist.jsonl -destroyAfter=15000 +destroyAfter=30000 diff --git a/java/runner/resources/redo/RedoContinuousViaFutures.properties b/java/runner/resources/redo/RedoContinuousViaFutures.properties index 16be70f..280d48b 100644 --- a/java/runner/resources/redo/RedoContinuousViaFutures.properties +++ b/java/runner/resources/redo/RedoContinuousViaFutures.properties @@ -4,4 +4,4 @@ source.2=REFERENCE load.0=/data/truthset/customers.jsonl load.1=/data/truthset/reference.jsonl load.2=/data/truthset/watchlist.jsonl -destroyAfter=15000 +destroyAfter=30000 diff --git a/java/runner/resources/redo/RedoWithInfoContinuous.properties b/java/runner/resources/redo/RedoWithInfoContinuous.properties index 16be70f..280d48b 100644 --- a/java/runner/resources/redo/RedoWithInfoContinuous.properties +++ b/java/runner/resources/redo/RedoWithInfoContinuous.properties @@ -4,4 +4,4 @@ source.2=REFERENCE load.0=/data/truthset/customers.jsonl load.1=/data/truthset/reference.jsonl load.2=/data/truthset/watchlist.jsonl -destroyAfter=15000 +destroyAfter=30000 From 7c8c3d926721196f0d9cdec21151cee09cec2318 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 14:17:54 -0800 Subject: [PATCH 37/59] Changed expected exit code on kill for Windows --- java/runner/java/com/senzing/runner/SnippetRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/runner/java/com/senzing/runner/SnippetRunner.java b/java/runner/java/com/senzing/runner/SnippetRunner.java index c925983..d0689ae 100644 --- a/java/runner/java/com/senzing/runner/SnippetRunner.java +++ b/java/runner/java/com/senzing/runner/SnippetRunner.java @@ -336,7 +336,7 @@ private static void executeSnippet(String snippet, long delay = Long.parseLong(propValue); boolean exited = process.waitFor(delay, TimeUnit.MILLISECONDS); if (!exited && process.isAlive()) { - expectedExitValue = SIGTERM_EXIT_CODE; + expectedExitValue = (WINDOWS) ? 1 : SIGTERM_EXIT_CODE; System.out.println(); System.out.println("Runner destroying " + snippet + " process..."); // NOTE: using process.destroy() does not trigger the registered From d5fd01a4c69cadfb3c9b9edbf6f85f0e3c55cac4 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 14:34:06 -0800 Subject: [PATCH 38/59] update homepath --- .github/workflows/csharp-windows-snippets.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index a6fb518..c579114 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -32,8 +32,8 @@ jobs: - name: configure local nuget repo run: | $Env:sdk_package = Get-ChildItem -Path "C:\Program Files\Senzing\er\lib\" -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name - mkdir %USERPROFILE%\dev\nuget\packages - dotnet nuget add source %USERPROFILE%\dev\nuget\packages -n dev + mkdir $Env:HOMEPATH\dev\nuget\packages + dotnet nuget add source $Env:HOMEPATH\dev\nuget\packages -n dev dotnet nuget push "C:\Program Files\Senzing\er\lib\${Env:sdk_package}" --source dev - name: run csharp snippets From 3c406ccfe36ff5f00f4369c8f153e1f53a062f4d Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 14:49:11 -0800 Subject: [PATCH 39/59] Attempt to fix csharp on Windows test --- .github/workflows/csharp-windows-snippets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index c579114..5ff22f4 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -35,11 +35,11 @@ jobs: mkdir $Env:HOMEPATH\dev\nuget\packages dotnet nuget add source $Env:HOMEPATH\dev\nuget\packages -n dev dotnet nuget push "C:\Program Files\Senzing\er\lib\${Env:sdk_package}" --source dev + dotnet nuget list source - name: run csharp snippets env: SENZING_DATA_DIR: 'C:\Program Files\Senzing\er\data' run: | cd "${Env:GITHUB_WORKSPACE}"/csharp/runner - dotnet add SnippetRunner package Senzing.Sdk --version 4.0.0-beta dotnet run --project SnippetRunner all From b1722b540a70237d7e03bcf4083f5f2e48dbe6f5 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 14:55:33 -0800 Subject: [PATCH 40/59] Attempt to debug csharp failure on windows --- .github/workflows/csharp-windows-snippets.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 5ff22f4..94da990 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -33,6 +33,8 @@ jobs: run: | $Env:sdk_package = Get-ChildItem -Path "C:\Program Files\Senzing\er\lib\" -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name mkdir $Env:HOMEPATH\dev\nuget\packages + cd $Env:HOMEPATH\dev\nuget\packages + dir dotnet nuget add source $Env:HOMEPATH\dev\nuget\packages -n dev dotnet nuget push "C:\Program Files\Senzing\er\lib\${Env:sdk_package}" --source dev dotnet nuget list source From a31612bdb3d4d6da6194a3eb524eca0fe7d69805 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 15:52:50 -0800 Subject: [PATCH 41/59] Attempt to fix csharp failure on windows --- .github/workflows/csharp-windows-snippets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 94da990..3698164 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -43,5 +43,5 @@ jobs: env: SENZING_DATA_DIR: 'C:\Program Files\Senzing\er\data' run: | - cd "${Env:GITHUB_WORKSPACE}"/csharp/runner + cd ${Env:GITHUB_WORKSPACE}/csharp/runner dotnet run --project SnippetRunner all From 86dec53b9df16502fa3222c3c404ea8dba8ac035 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 16:00:43 -0800 Subject: [PATCH 42/59] Attempt to fix csharp failure on windows --- .github/workflows/csharp-windows-snippets.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 3698164..4fcac42 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -32,11 +32,11 @@ jobs: - name: configure local nuget repo run: | $Env:sdk_package = Get-ChildItem -Path "C:\Program Files\Senzing\er\lib\" -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name - mkdir $Env:HOMEPATH\dev\nuget\packages - cd $Env:HOMEPATH\dev\nuget\packages + mkdir $Env:USERPROFILE\dev\nuget\packages + cd $Env:USERPROFILE\dev\nuget\packages dir - dotnet nuget add source $Env:HOMEPATH\dev\nuget\packages -n dev - dotnet nuget push "C:\Program Files\Senzing\er\lib\${Env:sdk_package}" --source dev + dotnet nuget add source $Env:USERPROFILE\dev\nuget\packages -n senzing + dotnet nuget push "C:\Program Files\Senzing\er\lib\${Env:sdk_package}" --source senzing dotnet nuget list source - name: run csharp snippets From 50075aac81bb1519d11479c8c3297d855ed68963 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 16:06:34 -0800 Subject: [PATCH 43/59] Attempt to fix csharp failure on windows --- .github/workflows/csharp-windows-snippets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 4fcac42..466b95c 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -41,7 +41,7 @@ jobs: - name: run csharp snippets env: - SENZING_DATA_DIR: 'C:\Program Files\Senzing\er\data' + Path: 'C:\Program Files\Senzing\er\lib;${Path}' run: | cd ${Env:GITHUB_WORKSPACE}/csharp/runner dotnet run --project SnippetRunner all From 0cc3ab0dec9ff0a1e94c3fcb57841eeaf6638f48 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 16:13:23 -0800 Subject: [PATCH 44/59] Attempt to fix csharp failure on windows --- .github/workflows/csharp-windows-snippets.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 466b95c..bc238ca 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -43,5 +43,6 @@ jobs: env: Path: 'C:\Program Files\Senzing\er\lib;${Path}' run: | + echo $Env:Path cd ${Env:GITHUB_WORKSPACE}/csharp/runner dotnet run --project SnippetRunner all From ed3e806e4f43fde12da5cd1570c7940fe657e0d6 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 16:31:48 -0800 Subject: [PATCH 45/59] Attempt to fix csharp failure on windows --- .github/workflows/csharp-windows-snippets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index bc238ca..51c1c56 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -41,7 +41,7 @@ jobs: - name: run csharp snippets env: - Path: 'C:\Program Files\Senzing\er\lib;${Path}' + Path: C:\Program Files\Senzing\er\lib;$Env:Path run: | echo $Env:Path cd ${Env:GITHUB_WORKSPACE}/csharp/runner From 38cfe67f17fb2d5b307a946b5c859f7a5e23ab52 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 16:46:23 -0800 Subject: [PATCH 46/59] Remove unused imports from SnippetRunner.java --- java/runner/java/com/senzing/runner/InstallLocations.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/java/runner/java/com/senzing/runner/InstallLocations.java b/java/runner/java/com/senzing/runner/InstallLocations.java index 8612eb2..9df0aaf 100644 --- a/java/runner/java/com/senzing/runner/InstallLocations.java +++ b/java/runner/java/com/senzing/runner/InstallLocations.java @@ -1,14 +1,11 @@ package com.senzing.runner; -import javax.json.JsonObject; import java.io.File; import java.io.StringWriter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; -import static com.senzing.runner.Utilities.*; - /** * Describes the directories on disk used to find the Senzing product * installation and the support directories. From 051cfe92613bbe8bf44dca42ab0637d7d23035d0 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Fri, 21 Feb 2025 16:53:11 -0800 Subject: [PATCH 47/59] update path --- .github/workflows/csharp-windows-snippets.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 51c1c56..8454e94 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -39,6 +39,12 @@ jobs: dotnet nuget push "C:\Program Files\Senzing\er\lib\${Env:sdk_package}" --source senzing dotnet nuget list source + - name: Add to "Path" environment variable + run: | + Add-Content $env:GITHUB_PATH "C:\Program Files\PowerShell\7" + Add-Content $env:GITHUB_PATH "C:\Program Files\dotnet" + Add-Content $env:GITHUB_PATH "C:\Program Files\Senzing\er\lib" + - name: run csharp snippets env: Path: C:\Program Files\Senzing\er\lib;$Env:Path From da482542d146399a78cde1af6e9a7b2388524e64 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 17:01:06 -0800 Subject: [PATCH 48/59] Remove unused imports from SnippetRunner.java --- .github/workflows/csharp-windows-snippets.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 8454e94..039e718 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -41,13 +41,9 @@ jobs: - name: Add to "Path" environment variable run: | - Add-Content $env:GITHUB_PATH "C:\Program Files\PowerShell\7" - Add-Content $env:GITHUB_PATH "C:\Program Files\dotnet" Add-Content $env:GITHUB_PATH "C:\Program Files\Senzing\er\lib" - name: run csharp snippets - env: - Path: C:\Program Files\Senzing\er\lib;$Env:Path run: | echo $Env:Path cd ${Env:GITHUB_WORKSPACE}/csharp/runner From fbb924af2f64303652ab066ea021f37420ce32af Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 17:07:26 -0800 Subject: [PATCH 49/59] Remove unused imports from SnippetRunner.java --- csharp/runner/SnippetRunner/Program.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/csharp/runner/SnippetRunner/Program.cs b/csharp/runner/SnippetRunner/Program.cs index ebd212f..8721ae5 100644 --- a/csharp/runner/SnippetRunner/Program.cs +++ b/csharp/runner/SnippetRunner/Program.cs @@ -629,10 +629,10 @@ static string SetupTempRepository(InstallLocations senzingInstall) } } - string supportPath = supportDir.FullName; - string configPath = configDir.FullName; - string resourcePath = resourcesDir.FullName; - string baseConfig = File.ReadAllText(configFile); + string supportPath = supportDir.FullName.Replace("\\", "\\\\"); + string configPath = configDir.FullName.Replace("\\", "\\\\");; + string resourcePath = resourcesDir.FullName.Replace("\\", "\\\\");; + string baseConfig = File.ReadAllText(configFile).Replace("\\", "\\\\");; string settings = $$""" { "PIPELINE": { From ecedec1e24ede3568d0da302b42045669706cf39 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 19:59:50 -0800 Subject: [PATCH 50/59] Debug bad settings on C# SnippetRunner --- csharp/runner/SnippetRunner/Program.cs | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/csharp/runner/SnippetRunner/Program.cs b/csharp/runner/SnippetRunner/Program.cs index 8721ae5..6ffeb82 100644 --- a/csharp/runner/SnippetRunner/Program.cs +++ b/csharp/runner/SnippetRunner/Program.cs @@ -130,7 +130,8 @@ SortedDictionary> snippetsMap try { settingsJson = JsonNode.Parse(settings)?.AsObject(); - if (settingsJson == null) { + if (settingsJson == null) + { throw new Exception("Setting must be a JSON object: " + settings); } } @@ -548,10 +549,13 @@ ProcessStartInfo killStartInfo startInfo.WindowStyle = ProcessWindowStyle.Hidden; startInfo.UseShellExecute = false; Process? killer = Process.Start(killStartInfo); - if (killer == null) { + if (killer == null) + { process.Kill(true); - process.WaitForExit(); - } else { + process.WaitForExit(); + } + else + { killer.WaitForExit(); process.WaitForExit(); } @@ -630,9 +634,9 @@ static string SetupTempRepository(InstallLocations senzingInstall) } string supportPath = supportDir.FullName.Replace("\\", "\\\\"); - string configPath = configDir.FullName.Replace("\\", "\\\\");; - string resourcePath = resourcesDir.FullName.Replace("\\", "\\\\");; - string baseConfig = File.ReadAllText(configFile).Replace("\\", "\\\\");; + string configPath = configDir.FullName.Replace("\\", "\\\\"); ; + string resourcePath = resourcesDir.FullName.Replace("\\", "\\\\"); ; + string baseConfig = File.ReadAllText(configFile).Replace("\\", "\\\\"); ; string settings = $$""" { "PIPELINE": { @@ -655,6 +659,11 @@ static string SetupTempRepository(InstallLocations senzingInstall) configMgr.SetDefaultConfigID(configID); } + catch (Exception) + { + Console.Error.WriteLine(settings); + throw; + } finally { env.Destroy(); From 26080bd73730c7435fef042eaf11efb0279ec0e3 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 21:00:51 -0800 Subject: [PATCH 51/59] Debug bad settings on C# SnippetRunner --- csharp/runner/SnippetRunner/Program.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/csharp/runner/SnippetRunner/Program.cs b/csharp/runner/SnippetRunner/Program.cs index 6ffeb82..588d86e 100644 --- a/csharp/runner/SnippetRunner/Program.cs +++ b/csharp/runner/SnippetRunner/Program.cs @@ -636,7 +636,8 @@ static string SetupTempRepository(InstallLocations senzingInstall) string supportPath = supportDir.FullName.Replace("\\", "\\\\"); string configPath = configDir.FullName.Replace("\\", "\\\\"); ; string resourcePath = resourcesDir.FullName.Replace("\\", "\\\\"); ; - string baseConfig = File.ReadAllText(configFile).Replace("\\", "\\\\"); ; + string baseConfig = File.ReadAllText(configFile).Replace("\\", "\\\\"); + string databasePath = databaseFile.Replace("\\", "\\\\"); string settings = $$""" { "PIPELINE": { @@ -645,7 +646,7 @@ static string SetupTempRepository(InstallLocations senzingInstall) "RESOURCEPATH": "{{resourcePath}}" }, "SQL": { - "CONNECTION": "sqlite3://na:na@{{databaseFile}}" + "CONNECTION": "sqlite3://na:na@{{databasePath}}" } } """.Trim(); From 4f5e778c619f1b6c8ff8ea24b127ee59b55d5bd3 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Fri, 21 Feb 2025 21:17:46 -0800 Subject: [PATCH 52/59] Added missing close on file stream to LoadViaLoop --- csharp/snippets/loading/LoadViaLoop/Program.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/csharp/snippets/loading/LoadViaLoop/Program.cs b/csharp/snippets/loading/LoadViaLoop/Program.cs index 36c933d..f8d1181 100644 --- a/csharp/snippets/loading/LoadViaLoop/Program.cs +++ b/csharp/snippets/loading/LoadViaLoop/Program.cs @@ -130,6 +130,8 @@ } finally { + fs.Close(); + // IMPORTANT: make sure to destroy the environment env.Destroy(); From fedd224dd0838ac0f55f62dee888c1d1e0b1c799 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Mon, 24 Feb 2025 08:16:18 -0800 Subject: [PATCH 53/59] Empty-Commit From 6f3d507846a460d152d53b56096700f932ff0e5e Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Mon, 24 Feb 2025 09:55:40 -0800 Subject: [PATCH 54/59] Changed file opening access mode in C# and updated data directory searching for Java and C# --- csharp/runner/SnippetRunner/InstallLocations.cs | 16 ++++++++++++++++ .../deleting/DeleteViaFutures/Program.cs | 2 ++ .../snippets/deleting/DeleteViaLoop/Program.cs | 2 ++ .../deleting/DeleteWithInfoViaFutures/Program.cs | 2 ++ .../snippets/loading/LoadViaFutures/Program.cs | 5 ++++- csharp/snippets/loading/LoadViaLoop/Program.cs | 4 ++-- csharp/snippets/loading/LoadViaQueue/Program.cs | 4 ++-- .../loading/LoadWithInfoViaFutures/Program.cs | 4 +++- .../loading/LoadWithStatsViaLoop/Program.cs | 4 +++- .../com/senzing/runner/InstallLocations.java | 4 +++- 10 files changed, 39 insertions(+), 8 deletions(-) diff --git a/csharp/runner/SnippetRunner/InstallLocations.cs b/csharp/runner/SnippetRunner/InstallLocations.cs index cb93f8c..a297af5 100644 --- a/csharp/runner/SnippetRunner/InstallLocations.cs +++ b/csharp/runner/SnippetRunner/InstallLocations.cs @@ -302,6 +302,22 @@ 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/csharp/snippets/deleting/DeleteViaFutures/Program.cs b/csharp/snippets/deleting/DeleteViaFutures/Program.cs index 231c69e..0c228c4 100644 --- a/csharp/snippets/deleting/DeleteViaFutures/Program.cs +++ b/csharp/snippets/deleting/DeleteViaFutures/Program.cs @@ -159,6 +159,8 @@ TaskScheduler taskScheduler } finally { + fs.Close(); + // IMPORTANT: make sure to destroy the environment env.Destroy(); diff --git a/csharp/snippets/deleting/DeleteViaLoop/Program.cs b/csharp/snippets/deleting/DeleteViaLoop/Program.cs index 18ca6cc..f49596a 100644 --- a/csharp/snippets/deleting/DeleteViaLoop/Program.cs +++ b/csharp/snippets/deleting/DeleteViaLoop/Program.cs @@ -130,6 +130,8 @@ } finally { + fs.Close(); + // IMPORTANT: make sure to destroy the environment env.Destroy(); diff --git a/csharp/snippets/deleting/DeleteWithInfoViaFutures/Program.cs b/csharp/snippets/deleting/DeleteWithInfoViaFutures/Program.cs index 094656c..a930e2a 100644 --- a/csharp/snippets/deleting/DeleteWithInfoViaFutures/Program.cs +++ b/csharp/snippets/deleting/DeleteWithInfoViaFutures/Program.cs @@ -160,6 +160,8 @@ TaskScheduler taskScheduler } finally { + fs.Close(); + // IMPORTANT: make sure to destroy the environment env.Destroy(); diff --git a/csharp/snippets/loading/LoadViaFutures/Program.cs b/csharp/snippets/loading/LoadViaFutures/Program.cs index 8855cb6..9821743 100644 --- a/csharp/snippets/loading/LoadViaFutures/Program.cs +++ b/csharp/snippets/loading/LoadViaFutures/Program.cs @@ -49,7 +49,7 @@ TaskScheduler taskScheduler // keep track of the pending tasks and don't backlog too many for memory's sake IList<(Task, Record)> pendingFutures = new List<(Task, Record)>(MaximumBacklog); -FileStream fs = new FileStream(filePath, FileMode.Open); +FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read); try { // create a reader @@ -159,6 +159,9 @@ TaskScheduler taskScheduler } finally { + // close the file stream + fs.Close(); + // IMPORTANT: make sure to destroy the environment env.Destroy(); diff --git a/csharp/snippets/loading/LoadViaLoop/Program.cs b/csharp/snippets/loading/LoadViaLoop/Program.cs index f8d1181..fe61630 100644 --- a/csharp/snippets/loading/LoadViaLoop/Program.cs +++ b/csharp/snippets/loading/LoadViaLoop/Program.cs @@ -31,7 +31,7 @@ string filePath = (args.Length > 0) ? args[0] : DefaultFilePath; -FileStream fs = new FileStream(filePath, FileMode.Open); +FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read); try { // create a reader @@ -131,7 +131,7 @@ finally { fs.Close(); - + // IMPORTANT: make sure to destroy the environment env.Destroy(); diff --git a/csharp/snippets/loading/LoadViaQueue/Program.cs b/csharp/snippets/loading/LoadViaQueue/Program.cs index 991edb0..bb3c844 100644 --- a/csharp/snippets/loading/LoadViaQueue/Program.cs +++ b/csharp/snippets/loading/LoadViaQueue/Program.cs @@ -32,10 +32,9 @@ string filePath = (args.Length > 0) ? args[0] : DefaultFilePath; -FileStream fs = new FileStream(filePath, FileMode.Open); Thread producer = new Thread(() => { - FileStream fs = new FileStream(filePath, FileMode.Open); + FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read); try { StreamReader rdr = new StreamReader(fs, Encoding.UTF8); @@ -71,6 +70,7 @@ } finally { + fs.Close(); recordQueue.CompleteAdding(); } }); diff --git a/csharp/snippets/loading/LoadWithInfoViaFutures/Program.cs b/csharp/snippets/loading/LoadWithInfoViaFutures/Program.cs index 7c586d0..75f2097 100644 --- a/csharp/snippets/loading/LoadWithInfoViaFutures/Program.cs +++ b/csharp/snippets/loading/LoadWithInfoViaFutures/Program.cs @@ -50,7 +50,7 @@ TaskScheduler taskScheduler IList<(Task, Record)> pendingFutures = new List<(Task, Record)>(MaximumBacklog); -FileStream fs = new FileStream(filePath, FileMode.Open); +FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read); try { // create a reader @@ -161,6 +161,8 @@ TaskScheduler taskScheduler } finally { + fs.Close(); + // IMPORTANT: make sure to destroy the environment env.Destroy(); diff --git a/csharp/snippets/loading/LoadWithStatsViaLoop/Program.cs b/csharp/snippets/loading/LoadWithStatsViaLoop/Program.cs index 64839c0..31a672b 100644 --- a/csharp/snippets/loading/LoadWithStatsViaLoop/Program.cs +++ b/csharp/snippets/loading/LoadWithStatsViaLoop/Program.cs @@ -31,7 +31,7 @@ string filePath = (args.Length > 0) ? args[0] : DefaultFilePath; -FileStream fs = new FileStream(filePath, FileMode.Open); +FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read); try { // create a reader @@ -151,6 +151,8 @@ } finally { + fs.Close(); + // IMPORTANT: make sure to destroy the environment env.Destroy(); diff --git a/java/runner/java/com/senzing/runner/InstallLocations.java b/java/runner/java/com/senzing/runner/InstallLocations.java index 9df0aaf..efd0cc4 100644 --- a/java/runner/java/com/senzing/runner/InstallLocations.java +++ b/java/runner/java/com/senzing/runner/InstallLocations.java @@ -256,9 +256,11 @@ public static InstallLocations findLocations() { if ("dist".equals(installDir.getName())) { // use the "data" sub-directory of the dev build supportDir = new File(installDir, "data"); + } else if (windows || macOS) { + supportDir = new File(installDir, "data"); } else { // no explicit path, try the default support path - supportDir = new File(defaultSupportPath); + supportDir = new File(defaultSupportPath); } } else { From ed7eeae379d87ff45f5b38b99c575f29ab2b91d3 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Mon, 24 Feb 2025 10:09:39 -0800 Subject: [PATCH 55/59] update sdk filepath --- .github/workflows/csharp-darwin-snippets.yaml | 6 +++--- .github/workflows/csharp-linux-snippets.yaml | 4 ++-- .github/workflows/csharp-windows-snippets.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/csharp-darwin-snippets.yaml b/.github/workflows/csharp-darwin-snippets.yaml index 4d46d43..6696aab 100644 --- a/.github/workflows/csharp-darwin-snippets.yaml +++ b/.github/workflows/csharp-darwin-snippets.yaml @@ -31,11 +31,11 @@ jobs: - name: configure local nuget repo run: | - find /opt/senzing/er/lib/ -name "Senzing.Sdk*" | xargs -0 -L 1 basename - sdk_package=$(find /opt/senzing/er/lib/ -name "Senzing.Sdk*" | xargs -0 -L 1 basename) + 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) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev - dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev + dotnet nuget push /opt/senzing/er/sdk/dotnet/"${sdk_package}" --source dev - name: run csharp snippets env: diff --git a/.github/workflows/csharp-linux-snippets.yaml b/.github/workflows/csharp-linux-snippets.yaml index 30f0e50..0c5dfd1 100644 --- a/.github/workflows/csharp-linux-snippets.yaml +++ b/.github/workflows/csharp-linux-snippets.yaml @@ -37,10 +37,10 @@ jobs: - name: configure local nuget repo run: | - sdk_package=$(grep -Rl "Senzing.Sdk" /opt/senzing/er/lib/ | xargs -L 1 basename) + sdk_package=$(grep -Rl "Senzing.Sdk" /opt/senzing/er/sdk/dotnet/ | xargs -L 1 basename) mkdir -p ~/dev/nuget/packages dotnet nuget add source ~/dev/nuget/packages -n dev - dotnet nuget push /opt/senzing/er/lib/"${sdk_package}" --source dev + dotnet nuget push /opt/senzing/er/sdk/dotnet/"${sdk_package}" --source dev - name: run csharp snippets env: diff --git a/.github/workflows/csharp-windows-snippets.yaml b/.github/workflows/csharp-windows-snippets.yaml index 039e718..0a04f17 100644 --- a/.github/workflows/csharp-windows-snippets.yaml +++ b/.github/workflows/csharp-windows-snippets.yaml @@ -31,12 +31,12 @@ jobs: - name: configure local nuget repo run: | - $Env:sdk_package = Get-ChildItem -Path "C:\Program Files\Senzing\er\lib\" -Recurse | Where-Object {$_.Name -match "^Senzing.SDK*"} | Select-Object -ExpandProperty Name + $Env:sdk_package = Get-ChildItem -Path "C:\Program Files\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\lib\${Env:sdk_package}" --source senzing + dotnet nuget push "C:\Program Files\Senzing\er\sdk\dotnet\${Env:sdk_package}" --source senzing dotnet nuget list source - name: Add to "Path" environment variable From 780cb7333a5ebc5193422cedf2a429c7f941d5df Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Mon, 24 Feb 2025 10:20:52 -0800 Subject: [PATCH 56/59] Updated path to sz-sdk.jar in pom.xml --- java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index ab13857..ada36f7 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -20,7 +20,7 @@ sz-sdk 4.0.0-beta.2.0 system - ${SENZING_DIR}/lib/sz-sdk.jar + ${SENZING_DIR}/sdk/java/sz-sdk.jar org.glassfish @@ -88,7 +88,7 @@ false - ${SENZING_DIR}/lib/sz-sdk.jar + ${SENZING_DIR}/sdk/java/sz-sdk.jar From d0520a106b998a9d10a500ce18373099bba94a2f Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Mon, 24 Feb 2025 10:49:02 -0800 Subject: [PATCH 57/59] Updates to SnippetRunner for C# to properly kill subtasks --- csharp/runner/SnippetRunner/InstallLocations.cs | 8 ++++---- csharp/runner/SnippetRunner/Program.cs | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/csharp/runner/SnippetRunner/InstallLocations.cs b/csharp/runner/SnippetRunner/InstallLocations.cs index a297af5..9d57348 100644 --- a/csharp/runner/SnippetRunner/InstallLocations.cs +++ b/csharp/runner/SnippetRunner/InstallLocations.cs @@ -306,16 +306,16 @@ private static bool IsDirectory(string path) { case PlatformID.Win32NT: defaultSupportPath = Path.Combine(installDir.FullName, "data"); - break; + 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); + throw new NotSupportedException( + "Unsupported Operating System: " + + Environment.OSVersion.Platform); } // no explicit path, try the default support path diff --git a/csharp/runner/SnippetRunner/Program.cs b/csharp/runner/SnippetRunner/Program.cs index 588d86e..fed5775 100644 --- a/csharp/runner/SnippetRunner/Program.cs +++ b/csharp/runner/SnippetRunner/Program.cs @@ -544,7 +544,9 @@ static void ExecuteSnippet(string snippet, ProcessStartInfo killStartInfo - = new ProcessStartInfo("kill", "" + process.Id); + = (Environment.OSVersion.Platform == PlatformID.Win32NT) + ? new ProcessStartInfo("taskkill", ["/F", "/PID", "" + process.Id]) + : new ProcessStartInfo("kill", "" + process.Id); startInfo.WindowStyle = ProcessWindowStyle.Hidden; startInfo.UseShellExecute = false; From 50e650c7ea5de7e8097d7f02c532219449819942 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Mon, 24 Feb 2025 10:50:11 -0800 Subject: [PATCH 58/59] Updated auto-kill timeouts for redo-continuous snippets --- .../SnippetRunner/Resources/redo/RedoContinuous.properties | 2 +- .../Resources/redo/RedoContinuousViaFutures.properties | 2 +- .../Resources/redo/RedoWithInfoContinuous.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/csharp/runner/SnippetRunner/Resources/redo/RedoContinuous.properties b/csharp/runner/SnippetRunner/Resources/redo/RedoContinuous.properties index 16be70f..280d48b 100644 --- a/csharp/runner/SnippetRunner/Resources/redo/RedoContinuous.properties +++ b/csharp/runner/SnippetRunner/Resources/redo/RedoContinuous.properties @@ -4,4 +4,4 @@ source.2=REFERENCE load.0=/data/truthset/customers.jsonl load.1=/data/truthset/reference.jsonl load.2=/data/truthset/watchlist.jsonl -destroyAfter=15000 +destroyAfter=30000 diff --git a/csharp/runner/SnippetRunner/Resources/redo/RedoContinuousViaFutures.properties b/csharp/runner/SnippetRunner/Resources/redo/RedoContinuousViaFutures.properties index 16be70f..280d48b 100644 --- a/csharp/runner/SnippetRunner/Resources/redo/RedoContinuousViaFutures.properties +++ b/csharp/runner/SnippetRunner/Resources/redo/RedoContinuousViaFutures.properties @@ -4,4 +4,4 @@ source.2=REFERENCE load.0=/data/truthset/customers.jsonl load.1=/data/truthset/reference.jsonl load.2=/data/truthset/watchlist.jsonl -destroyAfter=15000 +destroyAfter=30000 diff --git a/csharp/runner/SnippetRunner/Resources/redo/RedoWithInfoContinuous.properties b/csharp/runner/SnippetRunner/Resources/redo/RedoWithInfoContinuous.properties index 16be70f..280d48b 100644 --- a/csharp/runner/SnippetRunner/Resources/redo/RedoWithInfoContinuous.properties +++ b/csharp/runner/SnippetRunner/Resources/redo/RedoWithInfoContinuous.properties @@ -4,4 +4,4 @@ source.2=REFERENCE load.0=/data/truthset/customers.jsonl load.1=/data/truthset/reference.jsonl load.2=/data/truthset/watchlist.jsonl -destroyAfter=15000 +destroyAfter=30000 From 5b77c54247c5fbac842af7f7911e6b8b9b69d069 Mon Sep 17 00:00:00 2001 From: "Barry M. Caceres" Date: Mon, 24 Feb 2025 11:01:53 -0800 Subject: [PATCH 59/59] Updated exit code for windows forced-kill of sub-task --- csharp/runner/SnippetRunner/Program.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/csharp/runner/SnippetRunner/Program.cs b/csharp/runner/SnippetRunner/Program.cs index fed5775..6193f9b 100644 --- a/csharp/runner/SnippetRunner/Program.cs +++ b/csharp/runner/SnippetRunner/Program.cs @@ -538,7 +538,8 @@ static void ExecuteSnippet(string snippet, bool exited = process.WaitForExit(delay); if (!exited && !process.HasExited) { - expectedExitValue = SigtermExitCode; + expectedExitValue = (Environment.OSVersion.Platform == PlatformID.Win32NT) + ? 1 : SigtermExitCode; Console.WriteLine(); Console.WriteLine("Runner destroying " + snippet + " process...");