diff --git a/agone_jenkins b/agone_jenkins index 369afc3..1124b91 100644 --- a/agone_jenkins +++ b/agone_jenkins @@ -2,7 +2,7 @@ pipeline { agent any environment { - COVERITY_URL = 'http://sumo:8085' +COVERITY_URL = 'http://coverity.etechtips.com' COVERITY_STREAM = 'agone-full' // Add Coverity binaries to PATH if not globally set on the Jenkins agent PATH = "/opt/coverity/analysis/bin:${env.PATH}" @@ -37,7 +37,7 @@ pipeline { // --spawn_strategy=standalone ensures Coverity intercepts compiler processes sh ''' cov-build --dir cov-int \ - bazel build --spawn_strategy=standalone //:run +bazel build --spawn_strategy=standalone //:run ''' // 3. Analyze captured code @@ -75,6 +75,10 @@ pipeline { script { echo "Starting agone-pr build..." echo "The current branch is: ${env.BRANCH_NAME}" +<<<<<<< HEAD +======= + +>>>>>>> origin/pullone // 1. Determine target branch and fetch changes def targetBranch = env.CHANGE_TARGET ?: 'main' sh "git fetch origin ${targetBranch}" diff --git a/bye.c b/bye.c index a94bbde..c61f27a 100644 --- a/bye.c +++ b/bye.c @@ -1,5 +1,9 @@ #include +// dummy code added int retval(int inputval) { - return inputval; + if (inputval >= 5 && inputval <=5) { + return inputval; + } + return inputval + 100; }