Merge pull request #1113 from kumvijaya/current

T8218: Fixed pull request branch fetching issue post Github pull_request_targte policy update

1 files changed, 3 insertions, 3 deletions

diff --git a/.github/workflows/trigger-docker-image-build.yml b/.github/workflows/trigger-docker-image-build.yml
index 9e55fd46..ebc1bcc8 100644
--- a/.github/workflows/trigger-docker-image-build.yml
+++ b/.github/workflows/trigger-docker-image-build.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Checkout vyos/vyos-build repo

         uses: actions/checkout@v4

         with:

-          ref: ${{ github.ref_name }}

+          ref: ${{ github.event.pull_request.base.ref }}

 

       - uses: dorny/paths-filter@v3

         id: changes

@@ -37,7 +37,7 @@ jobs:
             docker-dir:

               - 'docker/**'

 

-      - name: "Trigger Docker image build for ${{ github.ref_name }}"

+      - name: "Trigger Docker image build for ${{ github.event.pull_request.base.ref }}"

         if: ${{ steps.changes.outputs.docker-dir == 'true' }}

         run: |

           curl -L \

@@ -46,4 +46,4 @@ jobs:
             -H "Authorization: Bearer ${{ secrets.PAT }}" \

             -H "X-GitHub-Api-Version: 2022-11-28" \

             https://api.github.com/repos/${{ secrets.REMOTE_OWNER }}/${{ secrets.REMOTE_REUSE_REPO }}/actions/workflows/build-docker-image.yml/dispatches \

-            -d '{"ref": "${{ env.REF }}", "inputs":{"branch":"${{ github.ref_name }}", "environment":"production"}}'
\ No newline at end of file
+            -d '{"ref": "${{ env.REF }}", "inputs":{"branch":"${{ github.event.pull_request.base.ref }}", "environment":"production"}}'
\ No newline at end of file