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

opencrvs · Feb 28, 2025 · 00ccf6f · 00ccf6f
1 parent 10142de
commit 00ccf6f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml
@@ -67,7 +67,7 @@ jobs:
         with:
           fetch-depth: 0
           repository: '${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }}'
-          path: '${{ secrets.FORK_REPOSITORY_NAME }}'
+          # path: '${{ secrets.FORK_REPOSITORY_NAME }}'
       - if: steps.sync_fork.outcome == 'failure'
         name: Set up Git
         run: |
@@ -78,7 +78,6 @@ jobs:
         id: merge
         continue-on-error: true
         run: |
-          cd ${{ secrets.FORK_REPOSITORY_NAME }}
           git remote add upstream https://github.com/${UPSTREAM_REPOSITORY}.git
           git fetch upstream
           git checkout -b sync-with-${BASE_BRANCH}