Skip to content

Commit 6871e41

Browse files
kernelsamkernelsam
authored
#387 bump senzing-factory/github-action-install-senzing-sdk to @v5 (#388)
* #387 bump senzing-factory/github-action-install-senzing-sdk to @v5 * lint cleanup: zizmor, prettier, yamllint * lint cleanup: zizmor, prettier, yamllint
1 parent 3f1901c commit 6871e41

12 files changed

Lines changed: 76 additions & 65 deletions

‎.github/linters/.yaml-lint.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
extends: default
33

44
rules:
5+
document-start: disable
6+
comments:
7+
min-spaces-from-content: 1
58
comments-indentation: disable
69
line-length:
710
level: warning

‎.github/linters/zizmor.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
rules:
2+
secrets-outside-env:
3+
disable: true
24
unpinned-uses:
35
config:
46
policies:

‎.github/workflows/add-labels-standardized.yaml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ jobs:
1515
secrets:
1616
ORG_MEMBERSHIP_TOKEN: ${{ secrets.ORG_MEMBERSHIP_TOKEN }}
1717
MEMBERS: ${{ secrets.SENZING_MEMBERS }}
18-
uses: senzing-factory/build-resources/.github/workflows/add-labels-to-issue.yaml@v4
19-
20-
slack-notification:
21-
needs: [add-issue-labels]
22-
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.add-issue-labels.result) }}
23-
secrets:
2418
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
2519
SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
26-
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v4
27-
with:
28-
job-status: ${{ needs.add-issue-labels.result }}
20+
uses: senzing-factory/build-resources/.github/workflows/add-labels-to-issue.yaml@v4

‎.github/workflows/add-to-project-g2-python-dependabot.yaml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,8 @@ jobs:
1212
repository-projects: write
1313
secrets:
1414
PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
15-
uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@v4
16-
with:
17-
project: ${{ vars.SENZING_PROJECT_G2_PYTHON }}
18-
19-
slack-notification:
20-
needs: [add-to-project-dependabot]
21-
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.add-to-project-dependabot.result) }}
22-
secrets:
2315
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
2416
SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
25-
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v4
17+
uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@v4
2618
with:
27-
job-status: ${{ needs.add-to-project-dependabot.result }}
19+
project: ${{ vars.SENZING_PROJECT_G2_PYTHON }}

‎.github/workflows/add-to-project-g2-python.yaml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,9 @@ jobs:
1414
repository-projects: write
1515
secrets:
1616
PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
17+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
18+
SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
1719
uses: senzing-factory/build-resources/.github/workflows/add-to-project.yaml@v4
1820
with:
1921
project-number: ${{ vars.SENZING_PROJECT_G2_PYTHON }}
2022
org: ${{ vars.SENZING_GITHUB_ACCOUNT_NAME }}
21-
22-
slack-notification:
23-
needs: [add-to-project]
24-
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.add-to-project.result) }}
25-
secrets:
26-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
27-
SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
28-
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v4
29-
with:
30-
job-status: ${{ needs.add-to-project.result }}

‎.github/workflows/add-to-project-garage-dependabot.yaml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,8 @@ jobs:
1212
repository-projects: write
1313
secrets:
1414
PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
15-
uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@v4
16-
with:
17-
project: ${{ vars.SENZING_PROJECT_GARAGE }}
18-
19-
slack-notification:
20-
needs: [add-to-project-dependabot]
21-
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.add-to-project-dependabot.result) }}
22-
secrets:
2315
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
2416
SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
25-
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v4
17+
uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@v4
2618
with:
27-
job-status: ${{ needs.add-to-project-dependabot.result }}
19+
project: ${{ vars.SENZING_PROJECT_GARAGE }}

‎.github/workflows/add-to-project-garage.yaml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,9 @@ jobs:
1414
repository-projects: write
1515
secrets:
1616
PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
17+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
18+
SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
1719
uses: senzing-factory/build-resources/.github/workflows/add-to-project.yaml@v4
1820
with:
1921
project-number: ${{ vars.SENZING_PROJECT_GARAGE }}
2022
org: ${{ vars.SENZING_GITHUB_ACCOUNT_NAME }}
21-
22-
slack-notification:
23-
needs: [add-to-project]
24-
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.add-to-project.result) }}
25-
secrets:
26-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
27-
SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
28-
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v4
29-
with:
30-
job-status: ${{ needs.add-to-project.result }}

‎.github/workflows/dependabot-approve-and-merge.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ on:
44
pull_request:
55
branches: [main]
66

7-
concurrency:
8-
group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
9-
cancel-in-progress: true
10-
117
permissions: {}
128

139
jobs:

‎.github/workflows/pylint.yaml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ jobs:
4545
# shellcheck disable=SC2046
4646
pylint $(git ls-files '*.py' ':!:docs/source/*')
4747
48-
slack-notification:
49-
needs: [pylint]
50-
if: ${{ always() && contains(fromJSON('["failure", "cancelled"]'), needs.pylint.result ) && github.ref_name == github.event.repository.default_branch }}
51-
secrets:
52-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
53-
SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
54-
uses: senzing-factory/build-resources/.github/workflows/build-failure-slack-notification.yaml@v4
55-
with:
56-
job-status: ${{ needs.pylint.result }}
48+
- name: Notify Slack on failure
49+
if: (failure() || cancelled()) && github.ref_name == github.event.repository.default_branch
50+
uses: senzing-factory/build-resources/slack-failure-notification@v4
51+
with:
52+
job-status: ${{ job.status }}
53+
slack-channel: ${{ secrets.SLACK_CHANNEL }}
54+
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
55+
additional-info: "Python: ${{ matrix.python-version }}"

‎.github/workflows/pytest-darwin.yaml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,22 @@ jobs:
6565
source ./venv/bin/activate
6666
python -m pip install typing_extensions
6767
68+
- name: Mint staging tap token
69+
if: matrix.senzingsdk-version != 'production-v4'
70+
id: staging-token
71+
uses: actions/create-github-app-token@v3.1.1
72+
with:
73+
client-id: ${{ secrets.SENZINGSDK_STAGING_CLIENT_ID }}
74+
private-key: ${{ secrets.SENZINGSDK_STAGING_APP_KEY }}
75+
owner: senzing-factory # zizmor: ignore[github-app]
76+
repositories: homebrew-senzingsdk-staging
77+
permission-contents: read
78+
6879
- name: Install Senzing SDK
69-
uses: senzing-factory/github-action-install-senzing-sdk@v4
80+
uses: senzing-factory/github-action-install-senzing-sdk@v5
7081
with:
7182
senzingsdk-version: ${{ matrix.senzingsdk-version }}
83+
senzingsdk-token: ${{ steps.staging-token.outputs.token || github.token }}
7284

7385
- name: Set environment variables
7486
run: |
@@ -105,3 +117,12 @@ jobs:
105117
with:
106118
name: "coverage-${{ matrix.python-version }}-${{ matrix.senzingsdk-version }}"
107119
path: "coverage.${{ matrix.python-version }}-${{ matrix.senzingsdk-version }}"
120+
121+
- name: Notify Slack on failure
122+
if: (failure() || cancelled()) && github.event_name == 'schedule'
123+
uses: senzing-factory/build-resources/slack-failure-notification@v4
124+
with:
125+
job-status: ${{ job.status }}
126+
slack-channel: ${{ secrets.SLACK_CHANNEL }}
127+
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
128+
additional-info: "SDK: ${{ matrix.senzingsdk-version }} | Python: ${{ matrix.python-version }}"

0 commit comments

Comments
 (0)