You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ez...@apache.org on 2023/10/16 16:42:42 UTC
[trafficserver-ci] branch osx-pull-fix updated: Update osx.pipeline
This is an automated email from the ASF dual-hosted git repository.
eze pushed a commit to branch osx-pull-fix
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/osx-pull-fix by this push:
new 3c7a087 Update osx.pipeline
3c7a087 is described below
commit 3c7a0870086a2f6cded2bc820744e164a6b9d699
Author: Evan Zelkowitz <ez...@apache.org>
AuthorDate: Mon Oct 16 10:42:38 2023 -0600
Update osx.pipeline
---
jenkins/github/osx.pipeline | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/jenkins/github/osx.pipeline b/jenkins/github/osx.pipeline
index 703bd05..d4be42a 100644
--- a/jenkins/github/osx.pipeline
+++ b/jenkins/github/osx.pipeline
@@ -7,11 +7,24 @@ pipeline {
echo "${sha1}"
checkout([$class: 'GitSCM',
branches: [[name: sha1]],
- extensions: [],
- //+refs/pull/${GITHUB_PR_NUMBER}/merge:refs/remotes/origin-pull/pull/${GITHUB_PR_NUMBER}/merge
+ extensions: [
+ // We have to set an idenity for the merge step because Git requires
+ // the user.name and user.email to be set to do a merge.
+ [$class: "UserIdentity",
+ name: "ATS CI User",
+ email: "noreply@trafficserver.apache.org"
+ ],
+ [$class: "PreBuildMerge",
+ options: [
+ mergeTarget: "${GITHUB_PR_TARGET_BRANCH}",
+ fastForwardMode: "NO_FF",
+ mergeRemote: "origin",
+ mergeStrategy: "DEFAULT"
+ ]
+ ],
+ ],
userRemoteConfigs: [[url: github_url, refspec: '+refs/pull/*:refs/remotes/origin/pr/*']]])
- //userRemoteConfigs: [[url: 'https://github.com/ezelkow1/trafficserver', refspec: '+refs/pull/*:refs/remotes/origin/pr/*']]])
- //userRemoteConfigs: [[url: 'https://github.com/ezelkow1/trafficserver', refspec: '+refs/pull/${sha1}/merge:refs/remotes/origin/pull/${sha1}/merge']]])
+ sh 'git show -n 10 --decorate --graph --oneline --no-patch'
}
echo 'Finished Cloning'
}