diff --git a/.github/workflows/updateLocalizations.yml b/.github/workflows/updateLocalizations.yml index a9e5b6717..53445fab8 100644 --- a/.github/workflows/updateLocalizations.yml +++ b/.github/workflows/updateLocalizations.yml @@ -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 @@ -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: diff --git a/.gitmodules b/.gitmodules index e58896c97..413dd2497 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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