Skip to content

Commit

Permalink
Removed force branches in submodules and allowed to fail on approve s…
Browse files Browse the repository at this point in the history
…tage (#143)

* Removed force branches in submodules

* Added logs and allow to fail on approve stage

* Removed redundant symbols
  • Loading branch information
AleksSavelev authored Jan 15, 2024
1 parent bf340bd commit 9cb9832
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/updateLocalizations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ jobs:
git config --global user.name $APPROVE_BOT_NAME
git config --global user.email $APPROVE_BOT_EMAIL
- name: Approve pull requests
continue-on-error: true
run: |
mainFolder=$PWD
for folder in visuals/*; do
Expand All @@ -206,10 +207,9 @@ jobs:
echo "No changes for $repoName"
continue
fi
gh pr review $BRANCH --approve
echo "Pull request to $repoName was approved"
gh pr merge $BRANCH -s --auto -t "New translations"
echo "Pull request to $repoName was merged"
gh pr review $BRANCH --approve || echo "Cann't approve Pull Request to $repoName"
gh pr merge $BRANCH -s --auto -t "New translations" &&
echo "Pull request to $repoName was merged" || echo "Cann't merge Pull Request to $repoName"
echo "::endgroup::"
done;
env:
Expand Down
2 changes: 0 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[submodule "visuals/powerbi-visuals-timeline"]
path = visuals/powerbi-visuals-timeline
url = https://github.com/microsoft/powerbi-visuals-timeline
branch = master
[submodule "visuals/powerbi-visuals-wordcloud"]
path = visuals/powerbi-visuals-wordcloud
url = https://github.com/microsoft/powerbi-visuals-wordcloud
branch = main
[submodule "visuals/powerbi-visuals-tornado"]
path = visuals/powerbi-visuals-tornado
url = https://github.com/microsoft/powerbi-visuals-tornado
Expand Down

0 comments on commit 9cb9832

Please sign in to comment.