From 9cb9832c72849b4f4d8782a0aae4fe84fe7e4d70 Mon Sep 17 00:00:00 2001
From: Aleksandr Savelev <94454577+AleksSavelev@users.noreply.github.com>
Date: Mon, 15 Jan 2024 17:00:31 +0100
Subject: [PATCH] Removed force branches in submodules and allowed to fail on
 approve stage (#143)

* Removed force branches in submodules

* Added logs and allow to fail on approve stage

* Removed redundant symbols
---
 .github/workflows/updateLocalizations.yml | 8 ++++----
 .gitmodules                               | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

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