From 26e1e2ebca48281f57778c257ab0dff3fa468169 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 28 Feb 2025 14:58:39 +0200 Subject: [PATCH] Merge upstream/main into sync-with-upstream with conflicts --- .github/workflows/on-pull-request.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml index e3ba167..60ac432 100644 --- a/.github/workflows/on-pull-request.yaml +++ b/.github/workflows/on-pull-request.yaml @@ -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