Skip to content

Commit fb2c998

Browse files
Merge pull request #332 from regulaforensics/develop
Develop -> Stable
2 parents c00f1a1 + cd7baf5 commit fb2c998

2 files changed

Lines changed: 33 additions & 5 deletions

File tree

.github/workflows/update-clients.yml

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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 }}
@@ -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 }}
@@ -165,13 +179,20 @@ jobs:
165179
fi
166180
167181
git add --all
168-
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
182+
183+
if ! git diff-index --quiet --cached HEAD; then
184+
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
185+
else
186+
echo "No staged changes to commit."
187+
exit 0
188+
fi
169189
170190
if [ $? -eq 0 ]; then
171191
git push --set-upstream origin ${GITHUB_SHA::8}
172192
gh pr create --fill --base develop
173193
else
174194
echo "Nothing to commit."
195+
exit 0
175196
fi
176197
env:
177198
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}
@@ -212,13 +233,20 @@ jobs:
212233
fi
213234
214235
git add --all
215-
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
236+
237+
if ! git diff-index --quiet --cached HEAD; then
238+
git commit -m "Commit: ${{ needs.title.outputs.title }}" -a
239+
else
240+
echo "No staged changes to commit."
241+
exit 0
242+
fi
216243
217244
if [ $? -eq 0 ]; then
218245
git push --set-upstream origin ${GITHUB_SHA::8}
219246
gh pr create --fill --base develop
220247
else
221248
echo "Nothing to commit."
249+
exit 0
222250
fi
223251
env:
224252
GITHUB_TOKEN: ${{ secrets.REGULA_GITHUB_PUSH_TOKEN }}

p-process.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ components:
454454
selectLongestNames:
455455
type: boolean
456456
description: "Select the longest value from the different value sources and write it to the value field if comparison is done successfully. The parameter applies this logic to the personal names, such as given name, surname, surname and given name, middle name and etc."
457-
# default: false
457+
# default: true
458458
doBarcodes:
459459
description: "Set the types of barcodes to process."
460460
type: array

0 commit comments

Comments
 (0)