Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Senzing/github-action-install-senzing-api from 2 to 3 #41

Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions .github/workflows/docker-build-container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ jobs:
with:
image-repository: senzing/${{ steps.repo-basename.outputs.repo }}
password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
platforms: linux/amd64
username: ${{ secrets.DOCKERHUB_USERNAME }}
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ on: [push]
env:
DYLD_LIBRARY_PATH: /opt/senzing/g2/lib:/opt/senzing/g2/lib/macos
LD_LIBRARY_PATH: /opt/senzing/g2/lib:/opt/senzing/g2/lib/macos
SENZING_TOOLS_DATABASE_URL: 'sqlite3://na:na@/tmp/sqlite/G2C.db'
SENZING_TOOLS_DATABASE_URL: "sqlite3://na:na@/tmp/sqlite/G2C.db"
SENZING_TOOLS_ENABLE_ALL: true

permissions:
contents: read

jobs:
go-test-darwin:
name: 'go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}'
name: "go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
runs-on: ${{ matrix.os }}
strategy:
matrix:
go: ['1.21']
go: ["1.21"]
os: [macos-latest]
senzingapi-version: [production-v3]
senzingapi-version: [staging-v4]

steps:
- name: checkout repository
Expand All @@ -33,7 +33,7 @@ jobs:
go-version: ${{ matrix.go }}

- name: install Senzing API
uses: Senzing/github-action-install-senzing-api@v2
uses: Senzing/github-action-install-senzing-api@v3
with:
senzingapi-version: ${{ matrix.senzingapi-version }}

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/go-test-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ on: [push]

env:
LD_LIBRARY_PATH: /opt/senzing/g2/lib
SENZING_TOOLS_DATABASE_URL: 'sqlite3://na:na@/tmp/sqlite/G2C.db'
SENZING_TOOLS_DATABASE_URL: "sqlite3://na:na@/tmp/sqlite/G2C.db"

permissions:
contents: read

jobs:
go-test-linux:
name: 'go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}'
name: "go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
runs-on: ${{ matrix.os }}
strategy:
matrix:
go: ['1.21']
go: ["1.21"]
os: [ubuntu-latest]
senzingapi-version: [production-v3]
senzingapi-version: [staging-v4]

steps:
- name: checkout repository
Expand All @@ -31,9 +31,9 @@ jobs:
go-version: ${{ matrix.go }}

- name: install Senzing API
uses: Senzing/github-action-install-senzing-api@v2
uses: Senzing/github-action-install-senzing-api@v3
with:
senzingapi-version: ${{ matrix.senzingapi-version }}
senzingapi-runtime-version: ${{ matrix.senzingapi-version }}

- name: copy /etc files
run: sudo cp testdata/senzing-license/g2.lic /etc/opt/senzing/g2.lic
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/go-test-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ env:

jobs:
go-test-windows:
name: 'go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}'
name: "go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
runs-on: ${{ matrix.os }}
strategy:
matrix:
go: ['1.21']
go: ["1.21"]
os: [windows-latest]
senzingapi-version: [production-v3]
senzingapi-version: [staging-v4]

steps:
- name: checkout repository
Expand All @@ -30,7 +30,7 @@ jobs:
go-version: ${{ matrix.go }}

- name: install Senzing API
uses: Senzing/github-action-install-senzing-api@v2
uses: Senzing/github-action-install-senzing-api@v3
with:
senzingapi-version: ${{ matrix.senzingapi-version }}

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.1.0] - 2024-05-10

### Changed in 0.1.0

- Migrated from `g2` to `sz`
- Updated dependencies

## [0.0.4] - 2024-02-07

### Fixed in 0.0.4
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Stages
# -----------------------------------------------------------------------------

ARG IMAGE_GO_BUILDER=golang:1.21.4-bullseye
ARG IMAGE_FINAL=senzing/senzingapi-tools:3.8.0
ARG IMAGE_GO_BUILDER=golang:1.22.3-bullseye@sha256:e72f9a1d29fbd6e1603df5a780e8f407caebef4dbb9f07536fc72f1c368298aa
ARG IMAGE_FINAL=senzing/senzingapi-runtime-staging:latest

# -----------------------------------------------------------------------------
# Stage: senzingapi_runtime
Expand Down
20 changes: 10 additions & 10 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func RunE(_ *cobra.Command, _ []string) error {

// Build configuration for Senzing engine.

senzingEngineConfigurationJson, err := engineconfiguration.BuildAndVerifySenzingEngineConfigurationJson(ctx, viper.GetViper())
senzingSettings, err := engineconfiguration.BuildAndVerifySenzingEngineConfigurationJson(ctx, viper.GetViper())
if err != nil {
return err
}
Expand All @@ -141,14 +141,14 @@ func RunE(_ *cobra.Command, _ []string) error {
// Setup gRPC server

grpcserver := &grpcserver.GrpcServerImpl{
EnableAll: true,
LogLevelName: viper.GetString(option.LogLevel.Arg),
ObserverOrigin: viper.GetString(option.ObserverOrigin.Arg),
ObserverUrl: viper.GetString(option.ObserverUrl.Arg),
Port: viper.GetInt(option.GrpcPort.Arg),
SenzingEngineConfigurationJson: senzingEngineConfigurationJson,
SenzingModuleName: viper.GetString(option.EngineModuleName.Arg),
SenzingVerboseLogging: viper.GetInt64(option.EngineLogLevel.Arg),
EnableAll: true,
LogLevelName: viper.GetString(option.LogLevel.Arg),
ObserverOrigin: viper.GetString(option.ObserverOrigin.Arg),
ObserverUrl: viper.GetString(option.ObserverUrl.Arg),
Port: viper.GetInt(option.GrpcPort.Arg),
SenzingSettings: senzingSettings,
SenzingInstanceName: viper.GetString(option.EngineModuleName.Arg),
SenzingVerboseLogging: viper.GetInt64(option.EngineLogLevel.Arg),
}

// Create object and Serve.
Expand All @@ -162,7 +162,7 @@ func RunE(_ *cobra.Command, _ []string) error {
Observers: observers,
OpenApiSpecificationRest: senzingrestservice.OpenApiSpecificationJson,
ReadHeaderTimeout: 60 * time.Second,
SenzingEngineConfigurationJson: senzingEngineConfigurationJson,
SenzingEngineConfigurationJson: senzingSettings,
SenzingModuleName: viper.GetString(option.EngineModuleName.Arg),
SenzingVerboseLogging: viper.GetInt64(option.EngineLogLevel.Arg),
ServerAddress: viper.GetString(option.ServerAddress.Arg),
Expand Down
50 changes: 25 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ require (
github.com/senzing-garage/demo-entity-search v0.1.1
github.com/senzing-garage/go-cmdhelping v0.2.1
github.com/senzing-garage/go-observing v0.3.1
github.com/senzing-garage/go-rest-api-service v0.9.2
github.com/senzing-garage/go-rest-api-service v0.9.3
github.com/senzing-garage/go-rest-api-service-legacy v0.1.1
github.com/senzing-garage/serve-grpc v0.7.0
github.com/senzing-garage/serve-grpc v0.7.2
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.2
google.golang.org/grpc v1.63.2
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/creack/pty v1.1.21 // indirect
github.com/dlclark/regexp2 v1.11.0 // indirect
github.com/fatih/color v1.16.0 // indirect
Expand All @@ -41,43 +41,43 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/ogen-go/ogen v1.0.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.1 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.50.0 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/ogen-go/ogen v1.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.53.0 // indirect
github.com/prometheus/procfs v0.14.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/senzing-garage/g2-sdk-go v0.10.1 // indirect
github.com/senzing-garage/g2-sdk-go-base v0.6.1 // indirect
github.com/senzing-garage/g2-sdk-go-grpc v0.7.0 // indirect
github.com/senzing-garage/g2-sdk-json-type-definition v0.2.1 // indirect
github.com/senzing-garage/g2-sdk-proto/go v0.0.0-20240229231149-cd5a92459976 // indirect
github.com/senzing-garage/go-helpers v0.5.1 // indirect
github.com/senzing-garage/go-logging v1.4.1 // indirect
github.com/senzing-garage/go-messaging v1.4.1 // indirect
github.com/senzing-garage/go-sdk-abstract-factory v0.7.0 // indirect
github.com/senzing-garage/go-sdk-abstract-factory v0.8.0 // indirect
github.com/senzing-garage/sz-sdk-go v0.12.3 // indirect
github.com/senzing-garage/sz-sdk-go-core v0.7.1 // indirect
github.com/senzing-garage/sz-sdk-go-grpc v0.7.1 // indirect
github.com/senzing-garage/sz-sdk-json-type-definition v0.2.4 // indirect
github.com/senzing-garage/sz-sdk-proto v0.7.5 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/protobuf v1.33.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading
Loading