Merge pull request #139 from SaintAngeLs/dev

(#133) pre deployment merge and previous issues resolutions
SaintAngeLs · May 12, 2024 · 513d128 · 513d128
2 parents 0661ecc + b703a35
commit 513d128
Show file tree

Hide file tree

Showing 662 changed files with 22,312 additions and 606 deletions.
diff --git a/.github/workflows/azure_synchronisation.yml b/.github/workflows/azure_synchronisation.yml
@@ -29,7 +29,13 @@ jobs:
           AZURE_DEVOPS_PASSWORD: ${{ secrets.AZURE_DEVOPS_PASSWORD }} 
         run: |
           # git remote add azure https://$AZURE_DEVOPS_USERNAME:$AZURE_DEVOPS_PASSWORD@dev.azure.com/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
-          git remote add azure https://$AZURE_DEVOPS_PAT@dev.azure.com/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
+          # Check if the remote already exists
+          if git remote get-url azure; then
+            echo "Remote 'azure' already exists. Updating URL if needed."
+            git remote set-url azure https://$AZURE_DEVOPS_PAT@dev.azure.com/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
+          else
+            git remote add azure https://$AZURE_DEVOPS_PAT@dev.azure.com/SocialAppOIPproject/SocialApp_IO/_git/SocialApp_IO
+          fi
 
       - name: Push all branches to Azure DevOps
         run: git push azure --all --force

diff --git a/.github/workflows/build_microservices.yml b/.github/workflows/build_microservices.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
+    runs-on:  ubuntu-latest
     timeout-minutes: 30  
     strategy:
       matrix: