diff --git a/agone_jenkins b/agone_jenkins index a291590..25f9061 100644 --- a/agone_jenkins +++ b/agone_jenkins @@ -100,11 +100,20 @@ 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()