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

opencrvs · Feb 28, 2025 · e4ea889 · e4ea889
1 parent b431ef3
commit e4ea889
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml
@@ -37,7 +37,7 @@ jobs:
       BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
       # Check token under Olli's account
       GH_TOKEN: ${{ secrets.FORK_ORGANISATION_TOKEN }}
-      FORK_REPOSITORY_PATH: "${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }}"
+      FORK_REPOSITORY_PATH: "${{ env.FORK_REPOSITORY_ORGANISATION }}/${{ env.FORK_REPOSITORY_NAME }}"
     steps:
       - name: Check if PR branch exists in Farajaland repository
         id: check_branch
@@ -65,8 +65,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          repository: '${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }}'
-          # path: '${{ secrets.FORK_REPOSITORY_NAME }}'
+          repository: '${{ env.FORK_REPOSITORY_ORGANISATION }}/${{ env.FORK_REPOSITORY_NAME }}'
+          # path: '${{ env.FORK_REPOSITORY_NAME }}'
       - if: steps.sync_fork.outcome == 'failure'
         name: Set up Git
         run: |
@@ -94,7 +94,7 @@ jobs:
         run: |
           git push https://x-access-token:${{ secrets.FORK_ORGANISATION_TOKEN }}@github.com/${FORK_REPOSITORY_PATH}.git sync-with-${BASE_BRANCH}
 
-      - name: Create PR in ${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }}
+      - name: Create PR in ${{ env.FORK_REPOSITORY_ORGANISATION }}/${{ env.FORK_REPOSITORY_NAME }}
         if: steps.sync_fork.outcome == 'failure'
         run: |
           if gh pr create \