fixed pr build branching strategy
agone-combined/pipeline/head There was a failure building this commit
agone-combined/pipeline/pr-main There was a failure building this commit

This commit is contained in:
2026-09-29 23:46:46 -07:00
parent 8bf5a6ff54
commit f7036c59b8
+13 -3
View File
@@ -100,11 +100,21 @@ bazel build --spawn_strategy=standalone //:run
// 1. Determine target branch and fetch changes // 1. Determine target branch and fetch changes
def targetBranch = env.CHANGE_TARGET ?: 'main' 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( def changedFiles = sh(
script: "git diff --name-only origin/${targetBranch}...HEAD", script: "git diff --name-only ${mergeBase} HEAD",
returnStdout: true returnStdout: true
).trim() ).trim()