Skip to content

Commit b20eb95

Browse files
IaroslavRIaroslavR
authored
Merge pull request #4 from cachuperia/deps
deps
2 parents af3b6ca + a128b3d commit b20eb95

File tree

11 files changed

+150
-77
lines changed

11 files changed

+150
-77
lines changed

‎.github/workflows/approve.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ name: approve
22

33
on:
44
workflow_call:
5+
inputs:
6+
node-version:
7+
default: '18.16.0'
8+
description: Node runtime version
9+
required: false
10+
type: string
511
secrets:
612
token:
713
description: 'GitHub token'
@@ -13,6 +19,10 @@ jobs:
1319
name: Approve PR if all required checks passed
1420
timeout-minutes: 5
1521
steps:
16-
- uses: hmarr/auto-approve-action@v2
22+
- name: Set up Node ${{ inputs.node-version }}
23+
uses: actions/setup-node@v3.6.0
24+
with:
25+
node-version: ${{ inputs.node-version }}
26+
- uses: hmarr/auto-approve-action@v3.2.1
1727
with:
1828
github-token: ${{ secrets.token }}

‎.github/workflows/commitlint.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,27 @@ name: commitlint
22

33
on:
44
workflow_call:
5+
inputs:
6+
node-version:
7+
default: '18.16.0'
8+
description: Node runtime version
9+
required: false
10+
type: string
511

612
jobs:
713
commitlint:
814
runs-on: ubuntu-latest
915
name: Check PR commit messages with commitlint
1016
timeout-minutes: 5
1117
steps:
12-
- uses: actions/checkout@v2
18+
- name: Set up Node ${{ inputs.node-version }}
19+
uses: actions/setup-node@v3.6.0
1320
with:
14-
fetch-depth: 0
15-
- uses: actions/setup-node@v2
21+
node-version: ${{ inputs.node-version }}
22+
- uses: actions/checkout@v3.5.2
1623
with:
17-
node-version: '14'
24+
fetch-depth: 0
1825
- run: npm install commitlint-plugin-function-rules
19-
- uses: wagoid/commitlint-github-action@v3
26+
- uses: wagoid/commitlint-github-action@v5.4.1
2027
env:
2128
NODE_PATH: ${{ github.workspace }}/node_modules

‎.github/workflows/pre-commit.yml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ on:
88
description: Install asdf and plugins if true
99
required: false
1010
type: boolean
11+
node-version:
12+
default: '18.16.0'
13+
description: Node runtime version
14+
required: false
15+
type: string
1116
python-version:
12-
default: '3.8'
17+
default: '3.10'
1318
description: Python runtime version
1419
required: false
1520
type: string
@@ -24,24 +29,28 @@ jobs:
2429
name: Check all files with pre-commit
2530
timeout-minutes: 5
2631
steps:
27-
- uses: actions/checkout@v2
32+
- name: Set up Node ${{ inputs.node-version }}
33+
uses: actions/setup-node@v3.6.0
34+
with:
35+
node-version: ${{ inputs.node-version }}
36+
- uses: actions/setup-python@v4.6.0
37+
with:
38+
python-version: ${{ inputs.python-version }}
39+
- uses: actions/checkout@v3.5.2
2840
- name: Install asdf
29-
uses: asdf-vm/actions/setup@v1
41+
uses: asdf-vm/actions/setup@v2.1.0
3042
if: inputs.asdf
3143
- name: Install asdf plugins
3244
if: inputs.asdf
3345
run: make asdf
34-
- uses: actions/setup-python@v2
35-
with:
36-
python-version: ${{ inputs.python-version }}
3746
- name: Install machine user SSH key
3847
env:
3948
SSH_KEY: ${{ secrets.ssh-key }}
4049
if: env.SSH_KEY != null
41-
uses: webfactory/ssh-agent@v0.5.2
50+
uses: webfactory/ssh-agent@v0.8.0
4251
with:
4352
ssh-private-key: |
4453
${{ secrets.ssh-key }}
45-
- uses: pre-commit/action@v2.0.3
54+
- uses: pre-commit/action@v3.0.0
4655
env:
4756
SKIP: no-commit-to-branch

‎.github/workflows/publish.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ on:
2525
description: Docker image name
2626
required: false
2727
type: string
28+
node-version:
29+
default: '18.16.0'
30+
description: Node runtime version
31+
required: false
32+
type: string
2833
s3-bucket:
2934
description: S3 bucket name
3035
required: false
@@ -48,9 +53,13 @@ jobs:
4853
timeout-minutes: 5
4954
runs-on: ubuntu-latest
5055
steps:
51-
- uses: actions/checkout@v2
56+
- name: Set up Node ${{ inputs.node-version }}
57+
uses: actions/setup-node@v3.6.0
58+
with:
59+
node-version: ${{ inputs.node-version }}
60+
- uses: actions/checkout@v3.5.2
5261
- name: Install asdf
53-
uses: asdf-vm/actions/setup@v1
62+
uses: asdf-vm/actions/setup@v2.1.0
5463
if: inputs.asdf
5564
- name: Install asdf plugins
5665
if: inputs.asdf
@@ -59,12 +68,12 @@ jobs:
5968
env:
6069
SSH_KEY: ${{ secrets.ssh-key }}
6170
if: env.SSH_KEY != null
62-
uses: webfactory/ssh-agent@v0.5.2
71+
uses: webfactory/ssh-agent@v0.8.0
6372
with:
6473
ssh-private-key: |
6574
${{ secrets.ssh-key }}
6675
- name: Configure AWS Credentials
67-
uses: aws-actions/configure-aws-credentials@v1
76+
uses: aws-actions/configure-aws-credentials@v2.0.0
6877
with:
6978
aws-access-key-id: ${{ secrets.aws-access-key }}
7079
aws-secret-access-key: ${{ secrets.aws-secret-key }}
@@ -75,7 +84,7 @@ jobs:
7584
env:
7685
ECR_REGISTRY: ${{ inputs.ecr-registry }}
7786
if: env.ECR_REGISTRY
78-
uses: aws-actions/amazon-ecr-login@v1
87+
uses: aws-actions/amazon-ecr-login@v1.6.0
7988
- name: Push to the artifactory
8089
env:
8190
ECR_REGISTRY: ${{ inputs.ecr-registry }}

‎.github/workflows/pytest.yml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ name: pytest
33
on:
44
workflow_call:
55
inputs:
6+
node-version:
7+
default: '18.16.0'
8+
description: Node runtime version
9+
required: false
10+
type: string
611
python-version:
7-
default: '3.8'
12+
default: '3.10'
813
description: Python runtime version
914
required: false
1015
type: string
@@ -36,18 +41,22 @@ jobs:
3641
runs-on: ubuntu-latest
3742
name: Run tests
3843
steps:
44+
- name: Set up Node ${{ inputs.node-version }}
45+
uses: actions/setup-node@v3.6.0
46+
with:
47+
node-version: ${{ inputs.node-version }}
3948
- name: Set up Python ${{ inputs.python-version }}
40-
uses: actions/setup-python@v2
49+
uses: actions/setup-python@v4.6.0
4150
with:
4251
python-version: ${{ inputs.python-version }}
43-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v3.5.2
4453
- name: Install poetry
4554
run: pip install poetry
4655
- name: Configure poetry
4756
shell: bash
4857
run: poetry config virtualenvs.in-project true
4958
- name: Set up poetry cache
50-
uses: actions/cache@v2
59+
uses: actions/cache@v3.3.1
5160
id: cache
5261
with:
5362
path: |
@@ -57,7 +66,7 @@ jobs:
5766
env:
5867
SSH_KEY: ${{ secrets.ssh-key }}
5968
if: env.SSH_KEY != null
60-
uses: webfactory/ssh-agent@v0.5.2
69+
uses: webfactory/ssh-agent@v0.8.0
6170
with:
6271
ssh-private-key: |
6372
${{ secrets.ssh-key }}
@@ -67,9 +76,6 @@ jobs:
6776
- name: Run unit tests
6877
if: inputs.run-unit
6978
run: make test
70-
- name: Add coverage comment to PR
71-
if: inputs.run-unit
72-
uses: coroo/pytest-coverage-commentator@v1.0.2
7379
- name: Run integration tests
7480
if: ${{ inputs.run-integration == true}}
7581
env:

‎.github/workflows/release-workflow.yml‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ on:
88
description: Install asdf and plugins if true
99
required: false
1010
type: boolean
11+
node-version:
12+
default: '18.16.0'
13+
description: Node runtime version
14+
required: false
15+
type: string
1116
python-version:
12-
default: '3.8'
17+
default: '3.10'
1318
description: Python runtime version
1419
required: false
1520
type: string
@@ -25,32 +30,36 @@ jobs:
2530
release:
2631
runs-on: ubuntu-latest
2732
steps:
28-
- uses: actions/checkout@v2
29-
with:
30-
fetch-depth: 0
31-
token: ${{ secrets.token }}
32-
- name: Install asdf
33-
uses: asdf-vm/actions/setup@v1
34-
if: inputs.asdf
35-
- name: Install asdf plugins
36-
if: inputs.asdf
37-
run: make asdf
38-
- uses: actions/setup-python@v2
39-
with:
40-
python-version: ${{ inputs.python-version }}
41-
- name: Install machine user SSH key
42-
env:
43-
SSH_KEY: ${{ secrets.ssh-key }}
44-
if: env.SSH_KEY != null
45-
uses: webfactory/ssh-agent@v0.5.2
46-
with:
47-
ssh-private-key: |
48-
${{ secrets.ssh-key }}
49-
- name: Run semantic-release
50-
env:
51-
GH_TOKEN: ${{ secrets.token }}
52-
run: |
53-
pip install python-semantic-release poetry
54-
git config --global user.name "github-actions"
55-
git config --global user.email "action@github.com"
56-
semantic-release publish -v DEBUG -D commit_author="github-actions <action@github.com>"
33+
- name: Set up Node ${{ inputs.node-version }}
34+
uses: actions/setup-node@v3.6.0
35+
with:
36+
node-version: ${{ inputs.node-version }}
37+
- uses: actions/setup-python@v4.6.0
38+
with:
39+
python-version: ${{ inputs.python-version }}
40+
- uses: actions/checkout@v3.5.2
41+
with:
42+
fetch-depth: 0
43+
token: ${{ secrets.token }}
44+
- name: Install asdf
45+
uses: asdf-vm/actions/setup@v2.1.0
46+
if: inputs.asdf
47+
- name: Install asdf plugins
48+
if: inputs.asdf
49+
run: make asdf
50+
- name: Install machine user SSH key
51+
env:
52+
SSH_KEY: ${{ secrets.ssh-key }}
53+
if: env.SSH_KEY != null
54+
uses: webfactory/ssh-agent@v0.8.0
55+
with:
56+
ssh-private-key: |
57+
${{ secrets.ssh-key }}
58+
- name: Run semantic-release
59+
env:
60+
GH_TOKEN: ${{ secrets.token }}
61+
run: |
62+
pip install poetry python-semantic-release==7.33.3
63+
git config --global user.name "github-actions"
64+
git config --global user.email "action@github.com"
65+
semantic-release publish -v DEBUG -D commit_author="github-actions <action@github.com>"

‎.github/workflows/status-to-slack.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ name: status-to-slack
22

33
on:
44
workflow_call:
5+
inputs:
6+
node-version:
7+
default: '18.16.0'
8+
description: Node runtime version
9+
required: false
10+
type: string
511
secrets:
612
slack-webhook:
713
description: Slack channel webhook
@@ -17,3 +23,7 @@ jobs:
1723
with:
1824
repo_token: ${{secrets.GITHUB_TOKEN}}
1925
slack_webhook_url: ${{secrets.slack-webhook}}
26+
- name: Set up Node ${{ inputs.node-version }}
27+
uses: actions/setup-node@v3.6.0
28+
with:
29+
node-version: ${{ inputs.node-version }}

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
# IDE
22
# NOTHING HERE. PLEASE ADD YOUR IDE/EDITOR FILES TO YOUR .gitignore_global
33
# https://docs.github.com/en/github/using-git/ignoring-files#configuring-ignored-files-for-all-repositories-on-your-computer
4-
5-
# Environment variables
6-
.env
7-
.envrc

‎.pre-commit-config.yaml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.1.0
3+
rev: v4.4.0
44
hooks:
5+
- id: check-json
56
- id: check-toml
67
- id: check-yaml
78
- id: end-of-file-fixer
89
- id: no-commit-to-branch
910
- id: trailing-whitespace
1011
- repo: https://github.com/Yelp/detect-secrets
11-
rev: v1.1.0
12+
rev: v1.4.0
1213
hooks:
1314
- id: detect-secrets
1415
args: ['--baseline', '.secrets.baseline']
16+
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
17+
rev: v9.5.0
18+
hooks:
19+
- id: commitlint
20+
stages: [commit-msg]
21+
additional_dependencies:
22+
- '@commitlint/config-conventional'
23+
- '@commitlint/ensure'
24+
- 'commitlint-plugin-function-rules'

‎.secrets.baseline‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.0",
2+
"version": "1.4.0",
33
"plugins_used": [
44
{
55
"name": "ArtifactoryDetector"
@@ -20,6 +20,12 @@
2020
{
2121
"name": "CloudantDetector"
2222
},
23+
{
24+
"name": "DiscordBotTokenDetector"
25+
},
26+
{
27+
"name": "GitHubTokenDetector"
28+
},
2329
{
2430
"name": "HexHighEntropyString",
2531
"limit": 3.0
@@ -46,6 +52,9 @@
4652
{
4753
"name": "PrivateKeyDetector"
4854
},
55+
{
56+
"name": "SendGridDetector"
57+
},
4958
{
5059
"name": "SlackDetector"
5160
},
@@ -99,5 +108,5 @@
99108
}
100109
],
101110
"results": {},
102-
"generated_at": "2021-04-20T18:01:03Z"
111+
"generated_at": "2023-04-28T16:27:23Z"
103112
}

0 commit comments

Comments
 (0)