Skip to content

Commit

Permalink
Merge upstream/main into sync-with-upstream with conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Your Name committed Feb 28, 2025
1 parent ab3a25f commit 26e1e2e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/on-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
GH_TOKEN: ${{ secrets.FORK_ORGANISATION_TOKEN }}
FORK_REPOSITORY_PATH: "${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }}"
steps:
- name: Checkout OpenCRVS Countryconfig repository
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.base.ref }}
# - name: Checkout OpenCRVS Countryconfig repository
# uses: actions/checkout@v4
# with:
# ref: ${{ github.event.pull_request.base.ref }}

- name: Check if PR branch exists in Farajaland repository
id: check_branch
Expand Down

0 comments on commit 26e1e2e

Please sign in to comment.