Skip to content

Commit

Permalink
Merge branch 'main' into senzing-factory/build-resources#15
Browse files Browse the repository at this point in the history
  • Loading branch information
docktermj authored Jan 30, 2024
2 parents b11be66 + 4a5dca2 commit 6d12319
Show file tree
Hide file tree
Showing 22 changed files with 177 additions and 164 deletions.
29 changes: 11 additions & 18 deletions .github/workflows/add-to-project-garage-dependabot.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
name: add-to-project-garage-dependabot.yaml
name: 'add to project garage dependabot'

on:
pull_request:
types:
- opened
- reopened
env:
CREATOR: ${{ github.event.pull_request.user.login }}
branches: [main]

jobs:
add-to-project:
name: Add dependabot pull request to project
runs-on: ubuntu-latest
steps:
- name: Assign pull request to project
env:
BOOL: ${{ contains( env.CREATOR, 'dependabot' ) }}
if: ${{ env.BOOL == 'true' }}
uses: actions/add-to-project@v0.5.0
with:
project-url: https://github.com/orgs/senzing-garage/projects/3
github-token: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}

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
with:
project: ${{ vars.SENZING_PROJECT_GARAGE }}
8 changes: 5 additions & 3 deletions .github/workflows/add-to-project-garage.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: add-to-project-garage.yaml
name: 'add to project garage'

on:
issues:
types:
- reopened
- opened
- reopened

jobs:
add-to-project:
name: Add issue to project
Expand All @@ -12,5 +14,5 @@ jobs:
- name: Assign issue to project
uses: actions/add-to-project@v0.5.0
with:
project-url: https://github.com/orgs/senzing-garage/projects/3
project-url: https://github.com/orgs/${{ vars.SENZING_GITHUB_ACCOUNT_NAME }}/projects/${{ vars.SENZING_PROJECT_GARAGE }}
github-token: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}
6 changes: 4 additions & 2 deletions .github/workflows/dependabot-approve-and-merge.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
name: dependabot-approve-and-merge.yaml
name: 'dependabot approve and merge'

on:
pull_request:
branches: [main]

jobs:
dependabot-approve-and-merge:
permissions:
contents: write
pull-requests: write
uses: senzing-factory/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@main
secrets:
SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN: ${{ secrets.SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN }}
uses: senzing-factory/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@v1
6 changes: 4 additions & 2 deletions .github/workflows/docker-build-container.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
name: docker-build-container.yaml
name: 'docker build container'

on:
pull_request:
branches:
- main
workflow_dispatch:

jobs:
docker-build-container:
runs-on: ubuntu-latest
steps:
- name: Build docker image
uses: senzing-factory/github-action-docker-buildx-build@latest
uses: senzing-factory/github-action-docker-buildx-build@v1
with:
image-repository: senzing/senzing-tools
password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/docker-push-containers-to-dockerhub.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
name: docker-push-containers-to-dockerhub.yaml
name: 'docker push containers to dockerhub'

on:
push:
tags:
- "[0-9]+.[0-9]+.[0-9]+"

jobs:
docker-push-containers-to-dockerhub:
runs-on: ubuntu-latest
steps:
- name: Build docker image and push to DockerHub
uses: senzing-factory/github-action-docker-buildx-build@latest
uses: senzing-factory/github-action-docker-buildx-build@v1
with:
build-options: "--push"
image-repository: senzing/senzing-tools
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/go-proxy-pull.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
# Based on
# - https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
# - https://github.com/marketplace/actions/go-proxy-warming
# - https://github.com/andrewslotin/go-proxy-pull-action
# - https://futurestud.io/tutorials/github-actions-run-a-workflow-when-creating-a-tag

name: go-proxy-pull.yaml
name: 'go proxy pull'

on:
push:
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/go-test-darwin.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# Based on
# - https://github.com/marketplace/actions/setup-go-environment

name: go-test-darwin.yaml
name: 'go test darwin'

on: [push]

Expand All @@ -27,15 +24,20 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0

- 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
with:
senzingapi-version: ${{ matrix.senzingapi-version }}

- run: mkdir /tmp/sqlite

- run: touch /tmp/sqlite/G2C.db

- name: Run go test
run: go test -exec /Users/runner/work/senzing-tools/senzing-tools/bin/macos_exec_dyld.sh -v -p 1 ./...
5 changes: 1 addition & 4 deletions .github/workflows/go-test-linux.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# Based on
# - https://github.com/marketplace/actions/setup-go-environment

name: go-test-linux.yaml
name: 'go test linux'

on: [push]

Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/go-test-windows.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# Based on
# - https://github.com/marketplace/actions/setup-go-environment

name: go-test-windows.yaml
name: 'go test windows'

on: [push]

Expand All @@ -25,19 +22,25 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0

- 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
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: Copy /etc files
run: copy testdata/senzing-license/g2.lic "C:\Program Files\Senzing\g2\etc\g2.lic"

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

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

on:
pull_request:
Expand All @@ -9,4 +9,4 @@ permissions:

jobs:
gofmt:
uses: senzing-factory/build-resources/.github/workflows/gofmt.yaml@main
uses: senzing-factory/build-resources/.github/workflows/gofmt.yaml@v1
8 changes: 3 additions & 5 deletions .github/workflows/gosec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# Based on
# - https://github.com/securego/gosec

name: gosec.yaml
name: 'gosec'

on:
push:
Expand All @@ -22,7 +19,8 @@ jobs:
steps:
- name: Checkout Source
uses: actions/checkout@v4

- name: Run Gosec Security Scanner
uses: securego/gosec@master
uses: securego/gosec@v2.18.2
with:
args: ./...
8 changes: 7 additions & 1 deletion .github/workflows/make-github-release-assets-darwin.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: make-github-release-assets-darwin.yaml
name: "make github release assets darwin"

on:
push:
Expand All @@ -20,24 +20,30 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install create-dmg
run: brew install create-dmg

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

- name: Make executable file
run: make darwin/amd64

- name: Adjust create-dmg
run: |
sed -e "s|ln -s /Applications|ln -s /usr/local/bin|" /usr/local/bin/create-dmg > /usr/local/bin/create-dmg-new
mv /usr/local/bin/create-dmg /usr/local/bin/create-dmg-backup
mv /usr/local/bin/create-dmg-new /usr/local/bin/create-dmg
chmod +x /usr/local/bin/create-dmg
- name: Make a .dmg file
run: |
export BUILD_VERSION=$(git describe --always --tags --abbrev=0 --dirty | sed 's/v//')
create-dmg --app-drop-link 0 40 "senzing-tools-$BUILD_VERSION.dmg" "target/darwin-amd64/"
- name: Upload versioned package to release assets
uses: svenstaro/upload-release-action@v2
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/make-github-release-assets-linux.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: make-github-release-assets-linux.yaml
name: "make github release assets linux"

on:
push:
Expand All @@ -17,8 +17,10 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Make RPM/DEB files
run: make package

- name: Upload versioned packages to release assets
uses: svenstaro/upload-release-action@v2
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/make-github-release-assets-windows.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: make-github-release-assets-windows.yaml
name: "make github release assets windows"

on:
push:
Expand All @@ -20,12 +20,15 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0

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

- name: Make executable file
run: go build -o senzing-tools.exe

- name: Upload versioned packages to release assets
uses: svenstaro/upload-release-action@v2
with:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/make-go-github-file.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: make-go-github-file.yaml
name: 'make go github file'

on:
push:
Expand All @@ -7,11 +7,12 @@ on:

permissions:
contents: write
pull-requests: write

jobs:
make-go-github-file:
uses: senzing-factory/build-resources/.github/workflows/make-go-github-file.yaml@main
uses: senzing-factory/build-resources/.github/workflows/make-go-github-file.yaml@v1
secrets:
SENZING_GITHUB_GPG_PRIVATE_KEY: ${{ secrets.SENZING_GITHUB_GPG_PRIVATE_KEY }}
SENZING_GITHUB_GPG_PASSPHRASE: ${{ secrets.SENZING_GITHUB_GPG_PASSPHRASE }}
SENZING_GITHUB_ACTOR: ${{ secrets.SENZING_GITHUB_ACTOR }}
SENZING_GITHUB_GPG_PASSPHRASE: ${{ secrets.SENZING_GITHUB_GPG_PASSPHRASE }}
SENZING_GITHUB_GPG_PRIVATE_KEY: ${{ secrets.SENZING_GITHUB_GPG_PRIVATE_KEY }}
5 changes: 3 additions & 2 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.yaml
name: 'make go tag'

on:
push:
Expand All @@ -15,5 +15,6 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Make go version tag
uses: senzing-factory/github-action-make-go-tag@main
uses: senzing-factory/github-action-make-go-tag@v1
9 changes: 0 additions & 9 deletions .github/workflows/move-pr-to-done.yaml

This file was deleted.

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

-

## [0.6.3] - 2024-01-30

### Changed in 0.6.3

- Update dependencies
- github.com/senzing-garage/check-self v0.1.1
- github.com/senzing-garage/demo-entity-search v0.1.1
- github.com/senzing-garage/demo-quickstart v0.0.2
- github.com/senzing-garage/init-database v0.5.1
- github.com/senzing-garage/load v0.1.1
- github.com/senzing-garage/move v0.1.1
- github.com/senzing-garage/serve-grpc v0.6.1
- github.com/senzing-garage/serve-http v0.2.1

## [0.6.2] - 2024-01-15

### Changed in 0.6.2
Expand Down
12 changes: 6 additions & 6 deletions cmd/github.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// 0.6.3
// Created by make-go-github-file.yaml on Mon Jan 15 19:35:05 UTC 2024
// 0.6.4
// Created by make-go-github-file.yaml on Tue Jan 30 22:51:39 UTC 2024
//
//lint:file-ignore U1000 Ignore all unused code, it's generated
package cmd

var (
githubDate string = "2024-01-15"
githubDate string = "2024-01-30"
githubIteration string = "0"
githubRef string = "refs/tags/0.6.3"
githubRefName string = "0.6.3"
githubRef string = "refs/tags/0.6.4"
githubRefName string = "0.6.4"
githubRepository string = "senzing-garage/senzing-tools"
githubRepositoryName string = "senzing-tools"
githubVersion string = "0.6.3"
githubVersion string = "0.6.4"
)
Loading

0 comments on commit 6d12319

Please sign in to comment.