Skip to content

Commit 2169a40

Browse files
author
regula-bot
committed
Merge remote-tracking branch 'origin/develop' into stable
2 parents 131b008 + d63ed31 commit 2169a40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2447
-194
lines changed

‎.github/workflows/back-merge-handler.yml

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Back Merge handler
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- stable
8+
9+
jobs:
10+
pr_master_to_stable:
11+
runs-on: ubuntu-latest
12+
if: github.ref_name == 'master'
13+
steps:
14+
- uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
18+
- name: Check if PR exists
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
run: |
22+
prs=$(gh pr list \
23+
--repo "$GITHUB_REPOSITORY" \
24+
--json baseRefName,headRefName \
25+
--jq '
26+
map(select(.baseRefName == "stable" and .headRefName == "master"))
27+
| length
28+
')
29+
if ((prs > 0)); then
30+
echo "Pull Request already exists"
31+
echo "SKIP=true" >> $GITHUB_ENV
32+
fi
33+
34+
- name: Check if stable is ahead
35+
run: |
36+
commits=$(git rev-list origin/stable..origin/master --count)
37+
if ((commits == 0)); then
38+
echo "No diffs was found between branches"
39+
echo "SKIP=true" >> $GITHUB_ENV
40+
fi
41+
42+
- name: Create Pull Request
43+
if: env.SKIP != 'true'
44+
run: gh pr create -B stable -H master --title '[GitHub Actions] Merge master -> stable' --label back-merge --body 'Autogenerated Pull Request for `back-merge` triggered by Github Actions'
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
48+
pr_stable_to_develop:
49+
runs-on: ubuntu-latest
50+
if: github.ref_name == 'stable'
51+
steps:
52+
- uses: actions/checkout@v4
53+
with:
54+
fetch-depth: 0
55+
56+
- name: Check if PR exists
57+
env:
58+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59+
run: |
60+
prs=$(gh pr list \
61+
--repo "$GITHUB_REPOSITORY" \
62+
--json baseRefName,headRefName \
63+
--jq '
64+
map(select(.baseRefName == "develop" and .headRefName == "stable"))
65+
| length
66+
')
67+
if ((prs > 0)); then
68+
echo "Pull Request already exists"
69+
echo "SKIP=true" >> $GITHUB_ENV
70+
fi
71+
72+
- name: Check if stable is ahead
73+
run: |
74+
commits=$(git rev-list origin/develop..origin/stable --count)
75+
if ((commits == 0)); then
76+
echo "No diffs was found between branches"
77+
echo "SKIP=true" >> $GITHUB_ENV
78+
fi
79+
80+
- name: Create Pull Request
81+
if: env.SKIP != 'true'
82+
run: gh pr create -B develop -H stable --title '[GitHub Actions] Merge stable -> develop' --label back-merge --body 'Autogenerated Pull Request for `back-merge` triggered by Github Actions'
83+
env:
84+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/sast.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
# List of paths (space separated) to ignore
1717
# Supports PATTERNS
1818
# EXCLUDE_PATHS: 'foo bar/baz file.txt dir/*.yml'
19-
EXCLUDE_PATHS: ''
19+
EXCLUDE_PATHS: 'generator-templates regula/documentreader/webclient/gen'
2020
# List of rules (space separated) to ignore
2121
# EXCLUDE_RULES: 'generic.secrets.security.detected-aws-account-id.detected-aws-account-id'
2222
# See https://github.com/semgrep/semgrep-rules for rules registry

‎.github/workflows/trivy-scan.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ jobs:
2323
exit-code: '1'
2424
ignore-unfixed: true
2525
severity: 'CRITICAL,HIGH,MEDIUM,LOW'
26+
env:
27+
TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2

‎.openapi-generator-ignore

-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,3 @@ README.md
1111
.gitignore
1212
setup.py
1313
regula/documentreader/webclient/__init__.py
14-
15-
regula/documentreader/webclient/gen/models/container_list.py
16-
regula/documentreader/webclient/gen/models/authenticity_check_result.py

‎.openapi-generator/FILES

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ regula/__init__.py
22
regula/documentreader/__init__.py
33
regula/documentreader/webclient/gen/__init__.py
44
regula/documentreader/webclient/gen/api/__init__.py
5-
regula/documentreader/webclient/gen/api/default_api.py
5+
regula/documentreader/webclient/gen/api/healthcheck_api.py
66
regula/documentreader/webclient/gen/api/process_api.py
77
regula/documentreader/webclient/gen/api/transaction_api.py
88
regula/documentreader/webclient/gen/api_client.py
@@ -13,17 +13,21 @@ regula/documentreader/webclient/gen/models/area_array.py
1313
regula/documentreader/webclient/gen/models/area_container.py
1414
regula/documentreader/webclient/gen/models/auth_params.py
1515
regula/documentreader/webclient/gen/models/authenticity_check_list.py
16+
regula/documentreader/webclient/gen/models/authenticity_check_result.py
1617
regula/documentreader/webclient/gen/models/authenticity_check_result_item.py
1718
regula/documentreader/webclient/gen/models/authenticity_result.py
1819
regula/documentreader/webclient/gen/models/authenticity_result_all_of.py
1920
regula/documentreader/webclient/gen/models/authenticity_result_type.py
2021
regula/documentreader/webclient/gen/models/bc_pdf417_info.py
2122
regula/documentreader/webclient/gen/models/bc_roidetect.py
23+
regula/documentreader/webclient/gen/models/byte_array_result.py
24+
regula/documentreader/webclient/gen/models/byte_array_result_all_of.py
2225
regula/documentreader/webclient/gen/models/check_diagnose.py
2326
regula/documentreader/webclient/gen/models/check_result.py
2427
regula/documentreader/webclient/gen/models/chosen_document_type.py
2528
regula/documentreader/webclient/gen/models/chosen_document_type_result.py
2629
regula/documentreader/webclient/gen/models/chosen_document_type_result_all_of.py
30+
regula/documentreader/webclient/gen/models/container_list.py
2731
regula/documentreader/webclient/gen/models/critical.py
2832
regula/documentreader/webclient/gen/models/cross_source_value_comparison.py
2933
regula/documentreader/webclient/gen/models/data_module.py
@@ -48,6 +52,7 @@ regula/documentreader/webclient/gen/models/document_types_candidates.py
4852
regula/documentreader/webclient/gen/models/document_types_candidates_list.py
4953
regula/documentreader/webclient/gen/models/document_types_candidates_result.py
5054
regula/documentreader/webclient/gen/models/document_types_candidates_result_all_of.py
55+
regula/documentreader/webclient/gen/models/documents_database.py
5156
regula/documentreader/webclient/gen/models/encrypted_rcl_result.py
5257
regula/documentreader/webclient/gen/models/encrypted_rcl_result_all_of.py
5358
regula/documentreader/webclient/gen/models/face_api.py
@@ -61,6 +66,8 @@ regula/documentreader/webclient/gen/models/graphic_field_type.py
6166
regula/documentreader/webclient/gen/models/graphic_fields_list.py
6267
regula/documentreader/webclient/gen/models/graphics_result.py
6368
regula/documentreader/webclient/gen/models/graphics_result_all_of.py
69+
regula/documentreader/webclient/gen/models/healthcheck.py
70+
regula/documentreader/webclient/gen/models/healthcheck_documents_database.py
6471
regula/documentreader/webclient/gen/models/ident_result.py
6572
regula/documentreader/webclient/gen/models/ident_result_all_of.py
6673
regula/documentreader/webclient/gen/models/image_data.py

‎Pipfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ idna = "==3.7"
1313
requests = ">=2.32.3"
1414

1515
[dev-packages]
16-
setuptools = ">=21.0.0"
16+
setuptools = "==74.1.1"
1717
wheel = "*"
1818
twine = "*"
1919
chardet = "*"

‎Pipfile.lock

+32-40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)