Skip to content

Commit 0f8cb3f

Browse files
committed
Build in CI with conan v2
1 parent 268124e commit 0f8cb3f

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

.jenkins/Jenkinsfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pipeline {
2-
agent { label 'sds-builder-2204' }
2+
agent { label 'sds-builder-v5' }
33

44
environment {
55
ORG = 'sds'
@@ -21,7 +21,6 @@ pipeline {
2121
} }
2222
steps {
2323
script {
24-
sh(script: "sed -Ei 's, version = .*\"([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+).*, version = \"\\1-${env.BUILD_NUMBER}\",' conanfile.py")
2524
BUILD_MISSING = "--build missing"
2625
}
2726
}
@@ -45,6 +44,7 @@ pipeline {
4544
CONAN_CHANNEL = sh(script: "echo ${BRANCH_NAME} | sed -E 's,(\\w+-?\\d*)/.*,\\1,' | sed -E 's,-,_,' | tr -d '\n'", returnStdout: true)
4645
ECR_PATH = "${ECR_URL}/${ORG}/${PROJECT}"
4746
TAG = "${VER}@${CONAN_USER}/${CONAN_CHANNEL}"
47+
CONAN_FLAGS="--name ${PROJECT} --user ${CONAN_USER} --channel ${CONAN_CHANNEL}"
4848
slackSend color: '#0063D1', channel: '#sds-ci', message: "*${PROJECT}/${TAG}* is building: ${BUILD_URL}"
4949
env.pkg_version = "${PROJECT}/${TAG}"
5050
}
@@ -64,10 +64,10 @@ pipeline {
6464
steps {
6565
sh "hostname ; \
6666
echo $NODE_NAME ; \
67-
conan create ${BUILD_MISSING} -pr debug -o ${PROJECT}:sanitize=True . ${PROJECT}/${TAG} ; \
68-
conan create ${BUILD_MISSING} -pr debug . ${PROJECT}/${TAG} ; \
69-
conan create ${BUILD_MISSING} -pr test -o sisl:malloc_impl=tcmalloc . ${PROJECT}/${TAG} ; \
70-
conan create ${BUILD_MISSING} -pr test -o sisl:prerelease=True -o sisl:malloc_impl=tcmalloc . ${PROJECT}/${TAG} ; \
67+
conan create ${BUILD_MISSING} -s:h build_type=Debug -o ${PROJECT}/*:sanitize=True ${CONAN_FLAGS} . ; \
68+
conan create ${BUILD_MISSING} -s:h build_type=Debug ${CONAN_FLAGS} . ; \
69+
conan create ${BUILD_MISSING} -s:h build_type=RelWithDebInfo -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \
70+
conan create ${BUILD_MISSING} -s:h build_type=RelWithDebInfo -o sisl/*:prerelease=True -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \
7171
"
7272
}
7373
post {
@@ -80,8 +80,9 @@ pipeline {
8080
expression { !(env.BRANCH_NAME =~ /PR-/) }
8181
}
8282
steps {
83-
sh "conan user -r ebay-local -p ${ARTIFACTORY_PASS} _service_sds"
84-
sh "conan upload ${PROJECT}/${TAG} -c --all -r ebay-local"
83+
sh "conan remote login -p ${ARTIFACTORY_PASS} ebay-local _service_sds"
84+
sh "conan graph info ./ | grep 'ref: ' | awk '{print \$2}' | sort | uniq | grep -v ${PROJECT} | grep -v '#' | while read pkg; do conan upload -r ebay-local -c \"\${pkg}\"; done"
85+
sh "conan upload ${PROJECT}/${TAG} -c -r ebay-local"
8586
}
8687
}
8788
stage("Downstream Build") {

conanfile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class HomestoreConan(ConanFile):
1111
name = "homestore"
12-
version = "6.4.29"
12+
version = "6.4.30"
1313

1414
homepage = "https://github.com/eBay/Homestore"
1515
description = "HomeStore Storage Engine"
@@ -52,9 +52,9 @@ def build_requirements(self):
5252
self.test_requires("gtest/1.14.0")
5353

5454
def requirements(self):
55-
self.requires("iomgr/[~11.3, include_prerelease=True]@oss/master", transitive_headers=True)
56-
self.requires("sisl/[~12.2, include_prerelease=True]@oss/master", transitive_headers=True)
57-
self.requires("nuraft_mesg/[^3.4, include_prerelease=True]@oss/main", transitive_headers=True)
55+
self.requires("iomgr/[^11.3]@oss/master", transitive_headers=True)
56+
self.requires("sisl/[^12.2]@oss/master", transitive_headers=True)
57+
self.requires("nuraft_mesg/[^3.4]@oss/main", transitive_headers=True)
5858

5959
self.requires("farmhash/cci.20190513@", transitive_headers=True)
6060
if self.settings.arch in ['x86', 'x86_64']:

0 commit comments

Comments
 (0)