fixed
This commit is contained in:
+1
-5
@@ -74,13 +74,9 @@ bazel build --spawn_strategy=standalone //:run
|
|||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
echo "Starting agone-pr build..."
|
echo "Starting agone-pr build..."
|
||||||
echo "The current branch is: ${env.BRANCH_NAME}"
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> origin/pullone
|
|
||||||
// 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'
|
||||||
|
echo "The current branch is: ${env.BRANCH_NAME}"
|
||||||
sh "git fetch origin ${targetBranch}"
|
sh "git fetch origin ${targetBranch}"
|
||||||
|
|
||||||
// 2. Identify changed files relative to the target branch
|
// 2. Identify changed files relative to the target branch
|
||||||
|
|||||||
Reference in New Issue
Block a user