Skip to content

Commit

Permalink
github-util: Update FROM version (#705)
Browse files Browse the repository at this point in the history
* #1 Update version

* Update to template
  • Loading branch information
docktermj authored Oct 1, 2023
1 parent 89bbb4e commit 23e1ef1
Show file tree
Hide file tree
Showing 13 changed files with 122 additions and 56 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/add-dependabot-request-to-project-t-comm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@
# - https://github.com/srggrs/assign-one-project-github-action

name: add-dependabot-request-to-project-t-comm.yaml

on:
pull_request:
types:
- opened
- reopened

env:
GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}
CREATOR: ${{ github.event.pull_request.user.login }}

jobs:
assign_one_project:
add-dependabot-request-to-project:
name: Add dependabot pull request to Senzing Community project
runs-on: ubuntu-latest
steps:
- name: Assign pull request to project
env:
- name: Assign pull request to project
env:
BOOL: ${{ contains( env.CREATOR, 'dependabot' ) }}
uses: Senzing/github-action-add-issue-to-project@main
if: ${{ env.BOOL == 'true' }}
with:
project: 'https://github.com/orgs/Senzing/projects/2'
uses: Senzing/github-action-add-issue-to-project@main
if: ${{ env.BOOL == 'true' }}
with:
project: "https://github.com/orgs/Senzing/projects/2"
15 changes: 9 additions & 6 deletions .github/workflows/add-issue-to-project-t-comm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,23 @@
# - https://github.com/srggrs/assign-one-project-github-action

name: add-issue-to-project-t-comm.yaml

on:
issues:
types:
- reopened
- opened

env:
GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}

jobs:
assign_one_project:
add-issue-to-project:
name: Add issue to Senzing Community project
runs-on: ubuntu-latest
steps:
- name: Assign issue to project
uses: Senzing/github-action-add-issue-to-project@main
with:
project: 'https://github.com/orgs/Senzing/projects/2'
column_name: 'Backlog'
- name: Assign issue to project
uses: Senzing/github-action-add-issue-to-project@main
with:
project: "https://github.com/orgs/Senzing/projects/2"
column_name: "Backlog"
4 changes: 3 additions & 1 deletion .github/workflows/add-triage-label.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
# - https://github.com/andymckay/labeler

name: add-triage-label.yaml

on:
issues:
types:
- reopened
- opened

jobs:
automate-issues-labels:
add-triage-label:
name: Add triage label to issue
runs-on: ubuntu-latest
steps:
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/build-docker-container.yaml

This file was deleted.

15 changes: 15 additions & 0 deletions .github/workflows/dependabot-approve-and-merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: dependabot-approve-and-merge.yaml

on:
pull_request:
branches: [main]

jobs:
dependabot-approve-and-merge:
permissions:
contents: write
pull-requests: write
uses: Senzing/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@main
secrets:
SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN: ${{ secrets.SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN }}
18 changes: 18 additions & 0 deletions .github/workflows/docker-build-container.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: docker-build-container.yaml

on:
pull_request:
branches:
- main
workflow_dispatch:

jobs:
docker-build-container:
runs-on: ubuntu-latest
steps:
- name: Build docker image
uses: Senzing/github-action-docker-buildx-build@latest
with:
image-repository: senzing/stream-loader
password: ${{ secrets.DOCKERHUB_PASSWORD }}
username: ${{ secrets.DOCKERHUB_USERNAME }}
19 changes: 19 additions & 0 deletions .github/workflows/docker-push-containers-to-dockerhub.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: docker-push-containers-to-dockerhub.yaml

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/github-action-docker-buildx-build@latest
with:
build-options: "--push"
image-repository: senzing/stream-loader
image-tag: ${{ github.ref_name }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
username: ${{ secrets.DOCKERHUB_USERNAME }}
5 changes: 4 additions & 1 deletion .github/workflows/identify-customer.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
name: identify-customer.yaml

on:
issues:
types:
- opened

env:
GITHUB_TOKEN: ${{ secrets.ORG_MEMBERSHIP_TOKEN }}
MEMBER_LIST: ${{ secrets.SENZING_MEMBERS }}
CREATOR: ${{ github.actor }}

jobs:
automate-issues-labels:
identify-customer:
name: Add customer-submission label
runs-on: ubuntu-latest
steps:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/move-pr-to-done.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: move-pr-to-done.yaml

on:
pull_request:
types: [closed]

jobs:
move-pr-to-done:
uses: Senzing/build-resources/.github/workflows/move-pr-to-done.yaml@main
secrets:
SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
26 changes: 13 additions & 13 deletions .github/workflows/pylint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ name: pylint.yaml
on: [push]

jobs:
build:
pylint:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pylint
- name: Analysing the code with pylint
run: |
pylint $(git ls-files '*.py')
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pylint
- name: Analysing the code with pylint
run: |
pylint $(git ls-files '*.py')
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

-

## [2.2.9] - 2023-09-30

### Changed in 2.2.9

- In `Dockerfile`, updated FROM instruction to `senzing/senzingapi-runtime:3.7.1`
- In `requirements.txt`, updated:
- azure-servicebus==7.11.2
- boto3==1.28.57
- confluent-kafka==2.2.0
- orjson==3.9.7
- psycopg2-binary==2.9.8

## [2.2.8] - 2023-06-29

### Changed in 2.2.8
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ARG BASE_IMAGE=senzing/senzingapi-runtime:3.6.0
ARG BASE_IMAGE=senzing/senzingapi-runtime:3.7.1

# -----------------------------------------------------------------------------
# Stage: builder
# -----------------------------------------------------------------------------

FROM ${BASE_IMAGE} AS builder

ENV REFRESHED_AT=2023-06-29
ENV REFRESHED_AT=2023-09-29

LABEL Name="senzing/stream-loader" \
Maintainer="[email protected]" \
Version="2.2.8"
Version="2.2.9"

# Run as "root" for system installation.

Expand Down Expand Up @@ -55,11 +55,11 @@ RUN curl -X GET \

FROM ${BASE_IMAGE} AS runner

ENV REFRESHED_AT=2023-06-29
ENV REFRESHED_AT=2023-09-29

LABEL Name="senzing/stream-loader" \
Maintainer="[email protected]" \
Version="2.2.8"
Version="2.2.9"

# Define health check.

Expand Down
4 changes: 2 additions & 2 deletions stream-loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
# Metadata

__all__ = []
__version__ = "2.2.8" # See https://www.python.org/dev/peps/pep-0396/
__version__ = "2.2.9" # See https://www.python.org/dev/peps/pep-0396/
__date__ = '2018-10-29'
__updated__ = '2023-06-29'
__updated__ = '2023-09-30'

SENZING_PRODUCT_ID = "5001" # See https://github.com/Senzing/knowledge-base/blob/main/lists/senzing-product-ids.md
log_format = '%(asctime)s %(message)s'
Expand Down

0 comments on commit 23e1ef1

Please sign in to comment.