Merge upstream/main into sync-with-upstream with conflicts

opencrvs · Feb 28, 2025 · 29cc1bd · 29cc1bd
1 parent aa6cd2c
commit 29cc1bd
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml
@@ -68,7 +68,13 @@ jobs:
           fetch-depth: 0
           repository: '${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }}'
           path: '${{ secrets.FORK_REPOSITORY_NAME }}'
-      - run: |
+      - if: steps.sync_fork.outcome == 'failure'
+        name: Set up Git
+        run: |
+          git config --global user.email "you@example.com"
+          git config --global user.name "Your Name"
+      - if: steps.sync_fork.outcome == 'failure'
+        run: |
           pwd
           echo "Check: .."
           ls -la ..