Skip to content

Commit

Permalink
remove -u option from conan create to fix build conflict in libcurl (#…
Browse files Browse the repository at this point in the history
…202)

Co-authored-by: Ravi Nagarjun Akella <raakella1@$HOSTNAME>
  • Loading branch information
raakella1 and Ravi Nagarjun Akella authored Jan 10, 2024
1 parent 801b116 commit 537e8de
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pipeline {
if (("${env.BRANCH_NAME}" =~ /PR-/) && ("$BUILD_TYPE" == "debug")) {
sh "echo Skipping debug build for PR branch"
} else {
sh "conan create -u ${BUILD_MISSING} -o ${PROJECT}:malloc_impl=${ALLOC} -o ${PROJECT}:prerelease=${PRERELEASE} -o ${PROJECT}:sanitize=${SANITIZE} -pr ${BUILD_PROFILE} . ${PROJECT}/${TAG}"
sh "conan create ${BUILD_MISSING} -o ${PROJECT}:malloc_impl=${ALLOC} -o ${PROJECT}:prerelease=${PRERELEASE} -o ${PROJECT}:sanitize=${SANITIZE} -pr ${BUILD_PROFILE} . ${PROJECT}/${TAG}"
}
}
}
Expand Down

0 comments on commit 537e8de

Please sign in to comment.