Skip to content

Commit ed47ec5

Browse files
DzmitrySmaliakouDzmitrySmaliakou
authored
Merge pull request #135 from regulaforensics/stable
stable to master 8.2
2 parents f7ed4c0 + 3b125bf commit ed47ec5

6 files changed

Lines changed: 126 additions & 60 deletions

File tree

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: github.ref_name == 'master'
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
with:
1616
fetch-depth: 0
1717

@@ -41,15 +41,19 @@ jobs:
4141
4242
- name: Create Pull Request
4343
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'
44+
run: |
45+
gh pr create -B stable -H master \
46+
--title '[GitHub Actions] Merge master -> stable' \
47+
--label back-merge \
48+
--body 'Autogenerated Pull Request for `back-merge` triggered by GitHub Actions'
4549
env:
4650
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4751

4852
pr_stable_to_develop:
4953
runs-on: ubuntu-latest
5054
if: github.ref_name == 'stable'
5155
steps:
52-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@v6
5357
with:
5458
fetch-depth: 0
5559

@@ -79,6 +83,10 @@ jobs:
7983
8084
- name: Create Pull Request
8185
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'
86+
run: |
87+
gh pr create -B develop -H stable \
88+
--title '[GitHub Actions] Merge stable -> develop' \
89+
--label back-merge \
90+
--body 'Autogenerated Pull Request for `back-merge` triggered by GitHub Actions'
8391
env:
8492
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/make-prs-for-client-repos.yml‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,63 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Create PR for Python WebClient Repo
30-
run: gh pr create --base ${{ inputs.target_branch }} --head ${{ inputs.source_branch }} --title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' --label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' --repo regulaforensics/FaceSDK-web-python-client
30+
run: |
31+
gh pr create --base ${{ inputs.target_branch }} \
32+
--head ${{ inputs.source_branch }} \
33+
--title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' \
34+
--label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' \
35+
--repo regulaforensics/FaceSDK-web-python-client
3136
env:
3237
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
3338

3439
java-webclient-pr:
3540
runs-on: ubuntu-latest
3641
steps:
3742
- name: Create PR for Java WebClient Repo
38-
run: gh pr create --base ${{ inputs.target_branch }} --head ${{ inputs.source_branch }} --title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' --label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' --repo regulaforensics/FaceSDK-web-java-client
43+
run: |
44+
gh pr create --base ${{ inputs.target_branch }} \
45+
--head ${{ inputs.source_branch }} \
46+
--title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' \
47+
--label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' \
48+
--repo regulaforensics/FaceSDK-web-java-client
3949
env:
4050
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
4151

4252
js-webclient-pr:
4353
runs-on: ubuntu-latest
4454
steps:
4555
- name: Create PR for JS WebClient Repo
46-
run: gh pr create --base ${{ inputs.target_branch }} --head ${{ inputs.source_branch }} --title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' --label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' --repo regulaforensics/FaceSDK-web-js-client
56+
run: |
57+
gh pr create --base ${{ inputs.target_branch }} \
58+
--head ${{ inputs.source_branch }} \
59+
--title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' \
60+
--label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' \
61+
--repo regulaforensics/FaceSDK-web-js-client
4762
env:
4863
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
4964

5065
csharp-webclient-pr:
5166
runs-on: ubuntu-latest
5267
steps:
5368
- name: Create PR for CSharp WebClient Repo
54-
run: gh pr create --base ${{ inputs.target_branch }} --head ${{ inputs.source_branch }} --title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' --label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' --repo regulaforensics/FaceSDK-web-csharp-client
69+
run: |
70+
gh pr create --base ${{ inputs.target_branch }} \
71+
--head ${{ inputs.source_branch }} \
72+
--title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' \
73+
--label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' \
74+
--repo regulaforensics/FaceSDK-web-csharp-client
5575
env:
5676
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
5777

5878
openapi-pr:
5979
runs-on: ubuntu-latest
6080
steps:
6181
- name: Create PR for OpenAPI Repo
62-
run: gh pr create --base ${{ inputs.target_branch }} --head ${{ inputs.source_branch }} --title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' --label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' --repo regulaforensics/FaceSDK-web-openapi
82+
run: |
83+
gh pr create --base ${{ inputs.target_branch }} \
84+
--head ${{ inputs.source_branch }} \
85+
--title '[GitHub Actions] Merge ${{ inputs.source_branch }} -> ${{ inputs.target_branch }}' \
86+
--label OpenAPI --body 'Autogenerated Pull Request triggered by Github Actions in OpenAPI repository' \
87+
--repo regulaforensics/FaceSDK-web-openapi
6388
env:
6489
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}

‎.github/workflows/release-web-page.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,37 @@ on:
77

88
jobs:
99
build-and-push:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout Specifications
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414
with:
1515
path: 'master-branch'
16+
1617
- name: Install redoc-cli
17-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@v6
1819
with:
1920
node-version: 20
2021
registry-url: https://registry.npmjs.org/
22+
2123
- name: Build html page
2224
working-directory: master-branch
2325
run: |
2426
npm install -g @redocly/cli;
2527
npx @redocly/cli build-docs index.yml -o=doc.html;
28+
2629
- name: Checkout pages branch
27-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
2831
with:
2932
path: 'pages-branch'
3033
ref: 'gh-pages'
34+
3135
- name: Rewrite html page
3236
working-directory: pages-branch
3337
run: |
3438
rm index.html
3539
mv ../master-branch/doc.html index.html
40+
3641
- name: Push changes
3742
working-directory: pages-branch
3843
run: |

‎.github/workflows/update-clients.yml‎

Lines changed: 60 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout Specification Repo
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v6
3636
with:
37-
path: "FaceSDK-web-openapi"
37+
path: 'FaceSDK-web-openapi'
3838
ref: ${{ github.event.inputs.branch }}
3939

4040
- name: Checkout JS Client Repo
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v6
4242
with:
43-
repository: "regulaforensics/FaceSDK-web-js-client"
43+
repository: 'regulaforensics/FaceSDK-web-js-client'
4444
token: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
45-
path: "js-client"
46-
ref: "develop"
45+
path: 'js-client'
46+
ref: 'develop'
4747

4848
- name: Update Model According To Specification
4949
working-directory: js-client
@@ -64,13 +64,20 @@ jobs:
6464
fi
6565
6666
git add --all
67-
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
67+
68+
if ! git diff-index --quiet --cached HEAD; then
69+
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
70+
else
71+
echo "No staged changes to commit."
72+
exit 0
73+
fi
6874
6975
if [ $? -eq 0 ]; then
7076
git push --set-upstream origin ${GITHUB_SHA::8}
7177
gh pr create --fill --base develop
7278
else
7379
echo "Nothing to commit."
80+
exit 0
7481
fi
7582
env:
7683
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
@@ -80,25 +87,25 @@ jobs:
8087
runs-on: ubuntu-latest
8188
steps:
8289
- name: Specify Java Version
83-
uses: actions/setup-java@v4
90+
uses: actions/setup-java@v5
8491
with:
85-
distribution: "zulu"
92+
distribution: 'zulu'
8693
java-version: 11
8794
java-package: jdk
8895

8996
- name: Checkout Specification Repo
90-
uses: actions/checkout@v4
97+
uses: actions/checkout@v6
9198
with:
92-
path: "FaceSDK-web-openapi"
99+
path: 'FaceSDK-web-openapi'
93100
ref: ${{ github.event.inputs.branch }}
94101

95102
- name: Checkout Java Client Repo
96-
uses: actions/checkout@v4
103+
uses: actions/checkout@v6
97104
with:
98-
repository: "regulaforensics/FaceSDK-web-java-client"
105+
repository: 'regulaforensics/FaceSDK-web-java-client'
99106
token: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
100-
path: "java-client"
101-
ref: "develop"
107+
path: 'java-client'
108+
ref: 'develop'
102109

103110
- name: Update Model According To Specification
104111
working-directory: java-client
@@ -118,13 +125,20 @@ jobs:
118125
fi
119126
120127
git add --all
121-
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
128+
129+
if ! git diff-index --quiet --cached HEAD; then
130+
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
131+
else
132+
echo "No staged changes to commit."
133+
exit 0
134+
fi
122135
123136
if [ $? -eq 0 ]; then
124137
git push --set-upstream origin ${GITHUB_SHA::8}
125138
gh pr create --fill --base develop
126139
else
127140
echo "Nothing to commit."
141+
exit 0
128142
fi
129143
env:
130144
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
@@ -133,18 +147,18 @@ jobs:
133147
runs-on: ubuntu-latest
134148
steps:
135149
- name: Checkout Specification Repo
136-
uses: actions/checkout@v4
150+
uses: actions/checkout@v6
137151
with:
138-
path: "FaceSDK-web-openapi"
152+
path: 'FaceSDK-web-openapi'
139153
ref: ${{ github.event.inputs.branch }}
140154

141155
- name: Checkout Python Client Repo
142-
uses: actions/checkout@v4
156+
uses: actions/checkout@v6
143157
with:
144-
repository: "regulaforensics/FaceSDK-web-python-client"
158+
repository: 'regulaforensics/FaceSDK-web-python-client'
145159
token: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
146-
path: "python-client"
147-
ref: "develop"
160+
path: 'python-client'
161+
ref: 'develop'
148162

149163
- name: Update Model According To Specification
150164
working-directory: python-client
@@ -164,13 +178,20 @@ jobs:
164178
fi
165179
166180
git add --all
167-
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
181+
182+
if ! git diff-index --quiet --cached HEAD; then
183+
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
184+
else
185+
echo "No staged changes to commit."
186+
exit 0
187+
fi
168188
169189
if [ $? -eq 0 ]; then
170190
git push --set-upstream origin ${GITHUB_SHA::8}
171191
gh pr create --fill --base develop
172192
else
173193
echo "Nothing to commit."
194+
exit 0
174195
fi
175196
env:
176197
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
@@ -179,23 +200,23 @@ jobs:
179200
runs-on: ubuntu-latest
180201
steps:
181202
- name: Specify Dotnet Version
182-
uses: actions/setup-dotnet@v1
203+
uses: actions/setup-dotnet@v5
183204
with:
184-
dotnet-version: "3.1.x"
205+
dotnet-version: '3.1.x'
185206

186207
- name: Checkout Specification Repo
187-
uses: actions/checkout@v4
208+
uses: actions/checkout@v6
188209
with:
189-
path: "FaceSDK-web-openapi"
210+
path: 'FaceSDK-web-openapi'
190211
ref: ${{ github.event.inputs.branch }}
191212

192213
- name: Checkout C# Client Repo
193-
uses: actions/checkout@v4
214+
uses: actions/checkout@v6
194215
with:
195-
repository: "regulaforensics/FaceSDK-web-csharp-client"
216+
repository: 'regulaforensics/FaceSDK-web-csharp-client'
196217
token: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
197-
path: "csharp-client"
198-
ref: "develop"
218+
path: 'csharp-client'
219+
ref: 'develop'
199220

200221
- name: Update Model According To Specification
201222
working-directory: csharp-client
@@ -215,13 +236,20 @@ jobs:
215236
fi
216237
217238
git add --all
218-
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
239+
240+
if ! git diff-index --quiet --cached HEAD; then
241+
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
242+
else
243+
echo "No staged changes to commit."
244+
exit 0
245+
fi
219246
220247
if [ $? -eq 0 ]; then
221248
git push --set-upstream origin ${GITHUB_SHA::8}
222249
gh pr create --fill --base develop
223250
else
224251
echo "Nothing to commit."
252+
exit 0
225253
fi
226254
env:
227255
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}

‎.github/workflows/validate-spec.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616

1717
- name: Setup Node
18-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@v6
1919
with:
2020
node-version: 20
2121
registry-url: https://registry.npmjs.org/

0 commit comments

Comments
 (0)