Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/go-test-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ jobs:
echo CGO_LDFLAGS="-L${SENZING_PATH}/er/lib -lSz -Wl,-no_warn_duplicate_libraries"
} >> "$GITHUB_ENV"

- name: Copy /etc files
run: |
sudo mkdir -p "${SENZING_PATH}/etc"
sudo cp testdata/senzing-license/g2.lic "${SENZING_PATH}/er/etc/g2.lic"

- name: Copy test database files
run: |
mkdir -p /tmp/sqlite
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/go-test-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,6 @@ jobs:
echo "LD_LIBRARY_PATH=${SENZING_PATH}/er/lib"
} >> "$GITHUB_ENV"

- name: Copy /etc files
run: |
sudo mkdir -p /etc/opt/senzing
sudo cp testdata/senzing-license/g2.lic /etc/opt/senzing/g2.lic

- name: Copy test database files
run: |
mkdir -p /tmp/sqlite
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/go-test-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ jobs:
run: |
Add-Content "$env:GITHUB_PATH" "$Env:USERPROFILE\Senzing\er\lib"

- name: Copy /etc files
run: |
copy testdata/senzing-license/g2.lic "$Env:USERPROFILE\Senzing\er\etc\g2.lic"

- name: Copy test database files
run: |
mkdir "C:\Temp\sqlite"
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning].

-

## [0.9.16] - 2025-10-24

### Changed in 0.9.16

- Update dependencies

## [0.9.15] - 2025-07-18

### Changed in 0.9.15
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ GO_ARCH = $(word 2, $(GO_OSARCH))

GOBIN ?= $(shell go env GOPATH)/bin
LD_LIBRARY_PATH ?= /opt/senzing/er/lib
SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@/tmp/sqlite/G2C.db

# Export environment variables.

Expand Down
3 changes: 3 additions & 0 deletions bin/macos_exec_dyld.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
export SENZING_PATH=${HOME}/senzing
export DYLD_LIBRARY_PATH=${SENZING_PATH}/er/lib:${SENZING_PATH}/er/lib/macos
export LD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}
export CGO_CFLAGS="-g -I${SENZING_PATH}/er/sdk/c"
export CGO_LDFLAGS="-L${SENZING_PATH}/er/lib -lSz -Wl,-no_warn_duplicate_libraries"
export SENZING_TOOLS_DATABASE_URL="sqlite3://na:na@nowhere/tmp/sqlite/G2C.db"

"$@"
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ go 1.24.4
require (
github.com/senzing-garage/go-helpers v0.6.13
github.com/senzing-garage/go-logging v1.5.3
github.com/senzing-garage/sz-sdk-go v0.15.9
github.com/senzing-garage/sz-sdk-go-core v0.9.11
github.com/senzing-garage/sz-sdk-go-grpc v0.9.10
github.com/senzing-garage/sz-sdk-go-mock v0.8.12
github.com/senzing-garage/sz-sdk-go v0.15.11
github.com/senzing-garage/sz-sdk-go-core v0.9.12
github.com/senzing-garage/sz-sdk-go-grpc v0.9.11
github.com/senzing-garage/sz-sdk-go-mock v0.8.13
github.com/stretchr/testify v1.11.1
google.golang.org/grpc v1.76.0
)
Expand All @@ -19,11 +19,11 @@ require (
github.com/senzing-garage/go-messaging v1.5.3 // indirect
github.com/senzing-garage/go-observing v0.3.6 // indirect
github.com/senzing-garage/sz-sdk-proto v0.8.8 // indirect
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/text v0.28.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
google.golang.org/protobuf v1.36.8 // indirect
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
golang.org/x/net v0.46.0 // indirect
golang.org/x/sys v0.37.0 // indirect
golang.org/x/text v0.30.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
40 changes: 20 additions & 20 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ github.com/senzing-garage/go-messaging v1.5.3 h1:bH+LtEgNJj/PRbg1VMK9/Gk457Cdfdc
github.com/senzing-garage/go-messaging v1.5.3/go.mod h1:7qvSNAVyWcSIcsnDAm8obCxHItljN295O3fX4bOgfp0=
github.com/senzing-garage/go-observing v0.3.6 h1:vIQTaWbCxYRSJFw4pDKKfTqOYqugB2rUMH3LWwGUZFM=
github.com/senzing-garage/go-observing v0.3.6/go.mod h1:ghkX9HSaKGjwYzsPLZVt+FO9AU/w4jzqvI2MAXmfGXs=
github.com/senzing-garage/sz-sdk-go v0.15.9 h1:q/oPOWSqNAZQIE1uxfgfjcF1FA/Pnpa2v9wswn1jOcs=
github.com/senzing-garage/sz-sdk-go v0.15.9/go.mod h1:nfr5X+d17jd+PwHhpbT0JmB+yStJZERJADJweHAyZ0U=
github.com/senzing-garage/sz-sdk-go-core v0.9.11 h1:j3MpKEV7TZo5v41Tm6D8X4CK+7Ep6yOCwL/sRHTU4JQ=
github.com/senzing-garage/sz-sdk-go-core v0.9.11/go.mod h1:y9474bn2XZPuWAt6j5w9mASZNsuCHnvNhmRm2o5SCgw=
github.com/senzing-garage/sz-sdk-go-grpc v0.9.10 h1:JRkWTTCkpR+iSWf1EV4ptsRDowf/jHMr8Nn95dO/ZOs=
github.com/senzing-garage/sz-sdk-go-grpc v0.9.10/go.mod h1:9EGGPqWaHv4S9ipMCODw9UZDfB7R0jB8ICu8hisa5ME=
github.com/senzing-garage/sz-sdk-go-mock v0.8.12 h1:3LRGeS7T6cCU/H0K7jGUdawMiOZ3Y/spZX08GFdphng=
github.com/senzing-garage/sz-sdk-go-mock v0.8.12/go.mod h1:is0tlGKG+ypwozYEuBUbztTvxwHrBGQ3gppW1q+AFgE=
github.com/senzing-garage/sz-sdk-go v0.15.11 h1:uVw3JldDZTCwT9F8JMmmzCXcaijQGxvhAsILaCYllt4=
github.com/senzing-garage/sz-sdk-go v0.15.11/go.mod h1:OO/kisqP2NBG/3eRG0M1q9diOZDfFEHf+g+exCv6yv0=
github.com/senzing-garage/sz-sdk-go-core v0.9.12 h1:Xx/RdEQ3dewBKkOM4Y+svN0Xy9SondLLqmpXnX8aX6w=
github.com/senzing-garage/sz-sdk-go-core v0.9.12/go.mod h1:adVN44132sXy+PYeTOQMVlL06dpBjyicUNgjyfrd9qA=
github.com/senzing-garage/sz-sdk-go-grpc v0.9.11 h1:h/PqmuKdVtIX5++k+t3qBS29Rxm1er9/MYN5KT5E8Qg=
github.com/senzing-garage/sz-sdk-go-grpc v0.9.11/go.mod h1:XMhpN0o6cgHCmWABeURfksY3XYNJPwhSUi6gYCcZ7kY=
github.com/senzing-garage/sz-sdk-go-mock v0.8.13 h1:cnVjbGYCUS1EEI4uuik0mpaaSQjJN6M549m6qNBtsK4=
github.com/senzing-garage/sz-sdk-go-mock v0.8.13/go.mod h1:y4LJMd3Hw3CY2P8cP9nnYfUhzrwS0TlZNaTGkFZ/a/U=
github.com/senzing-garage/sz-sdk-proto v0.8.8 h1:jOX/GqLxvrdH4E9/nVGpYfgmxD6pXPb1H1RqjuYuSlw=
github.com/senzing-garage/sz-sdk-proto v0.8.8/go.mod h1:TiYEb9IAgBTmTmF2X4YL8lJf2FhqaeHmwGG1G4YTFro=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
Expand All @@ -54,22 +54,22 @@ go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFh
go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b h1:DXr+pvt3nC887026GRP39Ej11UATqWDmWuS99x26cD0=
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 h1:pmJpJEvT846VzausCQ5d7KreSROcDqmO388w5YbnltA=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1/go.mod h1:GmFNa4BdJZ2a8G+wCe9Bg3wwThLrJun751XstdJt5Og=
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 h1:M1rk8KBnUsBDg1oPGHNCxG4vc1f49epmTO7xscSajMk=
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
Expand Down
9 changes: 6 additions & 3 deletions makefiles/darwin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
# Variables
# -----------------------------------------------------------------------------

SENZING_DIR ?= /opt/senzing/er
SENZING_DIR ?= $(HOME)/senzing/er
SENZING_TOOLS_SENZING_DIRECTORY ?= $(SENZING_DIR)
LD_LIBRARY_PATH ?= $(SENZING_TOOLS_SENZING_DIRECTORY)/lib:$(SENZING_TOOLS_SENZING_DIRECTORY)/lib/macos
LD_LIBRARY_PATH := $(SENZING_TOOLS_SENZING_DIRECTORY)/lib:$(SENZING_TOOLS_SENZING_DIRECTORY)/lib/macos
DYLD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
CGO_CFLAGS := -g -I${SENZING_DIR}/sdk/c
CGO_LDFLAGS := -L$(SENZING_DIR)/lib -lSz -Wl,-no_warn_duplicate_libraries
PATH := $(MAKEFILE_DIRECTORY)/bin:/$(HOME)/go/bin:$(PATH)
SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@nowhere/tmp/sqlite/G2C.db

# -----------------------------------------------------------------------------
Expand Down Expand Up @@ -64,7 +67,7 @@ setup-osarch-specific:

.PHONY: test-osarch-specific
test-osarch-specific:
@go test -exec macos_exec_dyld.sh -json -v -p 1 ./... 2>&1 | tee /tmp/gotest.log | gotestfmt
@go test -exec $(MAKEFILE_DIRECTORY)/bin/macos_exec_dyld.sh -json -v -p 1 ./... 2>&1 | tee /tmp/gotest.log | gotestfmt

# -----------------------------------------------------------------------------
# Makefile targets supported only by this platform.
Expand Down
3 changes: 3 additions & 0 deletions makefiles/linux.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
# Variables
# -----------------------------------------------------------------------------

LD_LIBRARY_PATH ?= /opt/senzing/er/lib
SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
PATH := $(MAKEFILE_DIRECTORY)/bin:/$(HOME)/go/bin:$(PATH)

# -----------------------------------------------------------------------------
# OS specific targets
Expand Down
Loading