Skip to content

Commit

Permalink
#114 Merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
docktermj committed Mar 15, 2024
2 parents 383e499 + 204a6de commit 481d71d
Show file tree
Hide file tree
Showing 20 changed files with 212 additions and 146 deletions.
9 changes: 9 additions & 0 deletions .github/linters/.yaml-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Extends the default yamllint config by adjusting some options.
extends: default

rules:
comments-indentation: disable
line-length:
level: warning
allow-non-breakable-inline-mappings: true
truthy: disable
2 changes: 1 addition & 1 deletion .github/workflows/add-labels-standardized.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'add labels standardized'
name: add labels standardized

on:
issues:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/add-to-project-garage-dependabot.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
name: 'add to project garage dependabot'
name: add to project garage dependabot

on:
pull_request:
branches: [main]

jobs:

add-to-project-dependabot:
secrets:
SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@main
uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@v1
with:
project: ${{ vars.SENZING_PROJECT_GARAGE }}
11 changes: 6 additions & 5 deletions .github/workflows/add-to-project-garage.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'add to project garage'
name: add to project garage

on:
issues:
Expand All @@ -8,11 +8,12 @@ on:

jobs:
add-to-project:
name: Add issue to project
name: add issue to project
runs-on: ubuntu-latest

steps:
- name: Assign issue to project
uses: actions/add-to-project@v0.5.0
- name: assign issue to project
uses: actions/add-to-project@v0.6.0
with:
project-url: https://github.com/orgs/${{ vars.SENZING_GITHUB_ACCOUNT_NAME }}/projects/${{ vars.SENZING_PROJECT_GARAGE }}
github-token: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}
project-url: https://github.com/orgs/${{ vars.SENZING_GITHUB_ACCOUNT_NAME }}/projects/${{ vars.SENZING_PROJECT_GARAGE }}
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-approve-and-merge.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'dependabot approve and merge'
name: dependabot approve and merge

on:
pull_request:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/go-proxy-pull.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'go proxy pull'
name: go proxy pull

on:
push:
Expand All @@ -11,8 +11,9 @@ permissions:
jobs:
go-proxy-pull:
runs-on: ubuntu-latest

steps:
- name: Pull new module version
- name: pull new module version
uses: andrewslotin/[email protected]
with:
import_path: github.com/senzing-garage/go-rest-api-service
25 changes: 13 additions & 12 deletions .github/workflows/go-test-darwin.yaml
Original file line number Diff line number Diff line change
@@ -1,45 +1,46 @@
name: 'go test darwin'
name: go test darwin

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'

permissions:
contents: read

jobs:
go-test-darwin:
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: [staging]
name: "go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
senzingapi-version: [production-v3]

steps:
- name: Checkout repository
- name: checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup go
- name: setup go
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}

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

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

- name: Copy test database files
- name: copy test database files
run: mkdir /tmp/sqlite && cp testdata/sqlite/G2C.db /tmp/sqlite/G2C.db

- name: Run go test
- name: run go test
run: go test -exec /Users/runner/work/go-rest-api-service/go-rest-api-service/bin/macos_exec_dyld.sh -v -p 1 ./...
25 changes: 13 additions & 12 deletions .github/workflows/go-test-linux.yaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,45 @@
name: 'go test linux'
name: go test linux

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 }}'
runs-on: ${{ matrix.os }}
strategy:
matrix:
go: ["1.21"]
go: ['1.21']
os: [ubuntu-latest]
senzingapi-version: [latest]
name: "go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
senzingapi-version: [production-v3]

steps:
- name: Checkout repository
- name: checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup go
- name: setup go
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}

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

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

- name: Copy test database files
- name: copy test database files
run: mkdir /tmp/sqlite && cp testdata/sqlite/G2C.db /tmp/sqlite/G2C.db

- name: Run go test
- name: run go test
run: go test -v -p 1 ./...
27 changes: 14 additions & 13 deletions .github/workflows/go-test-windows.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'go test windows'
name: go test windows

on: [push]

Expand All @@ -10,37 +10,38 @@ permissions:

jobs:
go-test-windows:
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: [staging]
name: "go test with Senzing: ${{ matrix.senzingapi-version }}; OS: ${{ matrix.os }}; Go: ${{ matrix.go }}"
senzingapi-version: [production-v3]

steps:
- name: Checkout repository
- name: checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup go
- name: setup go
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}

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

- name: Add to "Path" environment variable
run: echo "C:\Program Files\Senzing\g2\lib" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: add to "Path" environment variable
run: echo "C:\Program Files\Senzing\g2\lib" | Out-File -FilePath "$env:GITHUB_PATH" -Encoding utf8 -Append

- name: Copy /etc files
- name: copy /etc files
run: copy testdata/senzing-license/g2.lic "C:\Program Files\Senzing\g2\etc\g2.lic"

- name: Copy test database files
- name: copy test database files
run: mkdir "C:\Temp\sqlite" && copy testdata/sqlite/G2C.db "C:\Temp\sqlite\G2C.db"

- name: Run go test
- name: run go test
run: go test -v -p 1 ./...
2 changes: 1 addition & 1 deletion .github/workflows/gofmt.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'gofmt'
name: gofmt

on:
pull_request:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/gosec.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'gosec'
name: gosec

on:
push:
Expand All @@ -16,11 +16,12 @@ jobs:
runs-on: ubuntu-latest
env:
GO111MODULE: on

steps:
- name: Checkout Source
- name: checkout repository
uses: actions/checkout@v4

- name: Run Gosec Security Scanner
uses: securego/gosec@v2.18.2
- name: run Gosec Security Scanner
uses: securego/gosec@v2.19.0
with:
args: ./...
17 changes: 17 additions & 0 deletions .github/workflows/lint-workflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: lint workflows

on:
push:
branches-ignore: [main]
pull_request:
branches: [main]

permissions:
contents: read
packages: read
pull-requests: read
statuses: write

jobs:
lint-workflows:
uses: senzing-factory/build-resources/.github/workflows/lint-workflows.yaml@v1
9 changes: 5 additions & 4 deletions .github/workflows/make-go-tag.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'make go tag'
name: make go tag

on:
push:
Expand All @@ -10,11 +10,12 @@ permissions:

jobs:
make-go-tag:
name: Make a vM.m.P tag
name: make a vM.m.P tag
runs-on: ubuntu-latest

steps:
- name: Checkout repository
- name: checkout repository
uses: actions/checkout@v4

- name: Make go version tag
- name: make go version tag
uses: senzing-factory/github-action-make-go-tag@v1
14 changes: 14 additions & 0 deletions .github/workflows/move-pr-to-done-dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: move pr to done dependabot

on:
pull_request:
branches: [main]
types: [closed]

jobs:
move-pr-to-done-dependabot:
secrets:
SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
uses: senzing-factory/build-resources/.github/workflows/move-pr-to-done-dependabot.yaml@v1
with:
project: ${{ vars.SENZING_PROJECT_GARAGE }}
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.9.2] - 2024-03-15

### Changed in 0.9.2

- Update dependencies
- github.com/ogen-go/ogen v1.0.0
- github.com/senzing-garage/g2-sdk-go v0.10.1
- github.com/senzing-garage/g2-sdk-json-type-definition v0.2.1
- github.com/senzing-garage/go-sdk-abstract-factory v0.7.0
- github.com/stretchr/testify v1.9.0
- go.opentelemetry.io/otel v1.24.0
- go.opentelemetry.io/otel/metric v1.24.0
- go.opentelemetry.io/otel/trace v1.24.0
- google.golang.org/grpc v1.62.1

## [0.9.1] - 2024-01-30

### Changed in 0.9.1

- Retracted version `v0.9.0` didn't work.
- Bumping version above `v0.9.0` to fix.

## [0.2.2] - 2024-01-30

### Changed in 0.2.2

- Retracted version `v0.9.0`

## [0.2.1] - 2024-01-29

### Changed in 0.2.1
Expand Down
Loading

0 comments on commit 481d71d

Please sign in to comment.