Skip to content

Commit b91f12f

Browse files
author
regula-bot
committed
Merge remote-tracking branch 'origin/develop' into stable
2 parents 7c87265 + ae73e50 commit b91f12f

Some content is hidden

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

45 files changed

+3654
-136
lines changed
Lines changed: 84 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
# List of paths (space separated) to ignore
1818
# Supports PATTERNS
1919
# EXCLUDE_PATHS: 'foo bar/baz file.txt dir/*.yml'
20-
EXCLUDE_PATHS: ''
20+
EXCLUDE_PATHS: 'client/generator-templates src/main/generated'
2121
# List of rules (space separated) to ignore
2222
# EXCLUDE_RULES: 'generic.secrets.security.detected-aws-account-id.detected-aws-account-id'
2323
# See https://github.com/semgrep/semgrep-rules for rules registry

client/.openapi-generator/FILES

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ src/main/generated/com/regula/documentreader/webclient/ProgressResponseBody.java
1111
src/main/generated/com/regula/documentreader/webclient/ServerConfiguration.java
1212
src/main/generated/com/regula/documentreader/webclient/ServerVariable.java
1313
src/main/generated/com/regula/documentreader/webclient/StringUtil.java
14-
src/main/generated/com/regula/documentreader/webclient/api/DefaultApi.java
14+
src/main/generated/com/regula/documentreader/webclient/api/HealthcheckApi.java
1515
src/main/generated/com/regula/documentreader/webclient/api/ProcessApi.java
1616
src/main/generated/com/regula/documentreader/webclient/api/TransactionApi.java
1717
src/main/generated/com/regula/documentreader/webclient/auth/ApiKeyAuth.java
@@ -26,6 +26,7 @@ src/main/generated/com/regula/documentreader/webclient/model/AuthenticityCheckRe
2626
src/main/generated/com/regula/documentreader/webclient/model/AuthenticityResult.java
2727
src/main/generated/com/regula/documentreader/webclient/model/BcPDF417INFO.java
2828
src/main/generated/com/regula/documentreader/webclient/model/BcROIDETECT.java
29+
src/main/generated/com/regula/documentreader/webclient/model/ByteArrayResult.java
2930
src/main/generated/com/regula/documentreader/webclient/model/ChosenDocumentType.java
3031
src/main/generated/com/regula/documentreader/webclient/model/ChosenDocumentTypeResult.java
3132
src/main/generated/com/regula/documentreader/webclient/model/CrossSourceValueComparison.java
@@ -43,6 +44,7 @@ src/main/generated/com/regula/documentreader/webclient/model/DocumentPositionRes
4344
src/main/generated/com/regula/documentreader/webclient/model/DocumentTypesCandidates.java
4445
src/main/generated/com/regula/documentreader/webclient/model/DocumentTypesCandidatesList.java
4546
src/main/generated/com/regula/documentreader/webclient/model/DocumentTypesCandidatesResult.java
47+
src/main/generated/com/regula/documentreader/webclient/model/DocumentsDatabase.java
4648
src/main/generated/com/regula/documentreader/webclient/model/EncryptedRCLResult.java
4749
src/main/generated/com/regula/documentreader/webclient/model/FDSIDList.java
4850
src/main/generated/com/regula/documentreader/webclient/model/FaceApi.java
@@ -52,6 +54,8 @@ src/main/generated/com/regula/documentreader/webclient/model/GetTransactionsByTa
5254
src/main/generated/com/regula/documentreader/webclient/model/GraphicField.java
5355
src/main/generated/com/regula/documentreader/webclient/model/GraphicFieldsList.java
5456
src/main/generated/com/regula/documentreader/webclient/model/GraphicsResult.java
57+
src/main/generated/com/regula/documentreader/webclient/model/Healthcheck.java
58+
src/main/generated/com/regula/documentreader/webclient/model/HealthcheckDocumentsDatabase.java
5559
src/main/generated/com/regula/documentreader/webclient/model/IdentResult.java
5660
src/main/generated/com/regula/documentreader/webclient/model/ImageData.java
5761
src/main/generated/com/regula/documentreader/webclient/model/ImageQA.java

client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
implementation("com.squareup.okhttp3:logging-interceptor:3.14.7")
2020
implementation("com.google.code.gson:gson:2.8.6")
2121
implementation("io.gsonfire:gson-fire:1.8.4")
22-
implementation("org.threeten:threetenbp:1.6.9")
22+
implementation("org.threeten:threetenbp:1.7.0")
2323
implementation("io.swagger:swagger-annotations:1.5.24")
2424
implementation("javax.annotation:javax.annotation-api:1.3.2")
2525
implementation("com.google.code.findbugs:jsr305:3.0.2")

0 commit comments

Comments
 (0)