From f7036c59b889263ab1188a6a532d9e09c05b902f Mon Sep 17 00:00:00 2001 From: Eric Downing Date: Tue, 29 Sep 2026 23:46:46 -0700 Subject: [PATCH] fixed pr build branching strategy --- agone_jenkins | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/agone_jenkins b/agone_jenkins index a291590..72151e6 100644 --- a/agone_jenkins +++ b/agone_jenkins @@ -100,11 +100,21 @@ bazel build --spawn_strategy=standalone //:run // 1. Determine target branch and fetch changes def targetBranch = env.CHANGE_TARGET ?: 'main' - sh "git fetch origin ${targetBranch}" - // 2. Identify changed files relative to the target branch + sh """ + git fetch origin \ + +refs/heads/${targetBranch}:refs/remotes/origin/${targetBranch} + """ +  + def mergeBase = sh( + script: "git merge-base HEAD origin/${targetBranch}", + returnStdout: true + ).trim() +  + echo "Merge base: ${mergeBase}" +  def changedFiles = sh( - script: "git diff --name-only origin/${targetBranch}...HEAD", + script: "git diff --name-only ${mergeBase} HEAD", returnStdout: true ).trim()