This commit is contained in:
sivanguetta 2022-05-30 15:37:02 +03:00
Родитель 03dcc6a665
Коммит b580b2d09d
1 изменённых файлов: 1 добавлений и 16 удалений

Просмотреть файл

@ -41,23 +41,8 @@ jobs:
if [ "$Conflicts" -gt 0 ] ; then
echo "There is a merge conflict. Aborting"
git merge --abort
echo "mergeConflicts=true" >> $GITHUB_ENV
else
echo "No merge conflicts"
echo "mergeConflicts=false" >> $GITHUB_ENV
exit 1
fi
- name: Add merge conflict comment
uses: mshick/add-pr-comment@v1
if: ${{ env.mergeConflicts == 'true' }}
with:
message: |
ASIM parsers have been changed. ARM templates cannot be regenerated due to a conflict between master and your branch. Please solve the conflicts.
repo-token: ${{ secrets.GITHUB_TOKEN }}
repo-token-user-login: 'github-actions[bot]' # The user.login for temporary GitHub tokens
allow-repeats: false # This is the default
- name: If there are merge conflicts, terminate the job
if: ${{ env.mergeConflicts == 'true' }}
run: exit 1
- name: Run kqlFuncYaml2Arm script
run: bash .script/kqlFuncYaml2Arm.sh
- name: Commit changes