Prepare merging to main: bump version to 4.1

koujl · koujl · commit 7cf0dbc40160 · 2026-03-09T15:51:40.000+08:00
diff --git a/.github/workflows/conan_build.yml b/.github/workflows/conan_build.yml
@@ -8,7 +8,6 @@ on:
   pull_request:
     branches:
       - main
-      - v4
 
 jobs:
   Build:
diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
     environment {
         ARTIFACTORY_PASS = credentials('ARTIFACTORY_PASS')
         CONAN_USER = 'oss'
-        TARGET_BRANCH = 'v4'
+        TARGET_BRANCH = 'main'
         STABLE_BRANCH = 'stable/v*'
         failed_pkg = ''
     }
diff --git a/conanfile.py b/conanfile.py
@@ -10,7 +10,7 @@
 
 class HomeObjectConan(ConanFile):
     name = "homeobject"
-    version = "4.0.9"
+    version = "4.1.0"
 
     homepage = "https://github.com/eBay/HomeObject"
     description = "Blob Store built on HomeStore"

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ pipeline {`
`4`	`4`	`environment {`
`5`	`5`	`ARTIFACTORY_PASS = credentials('ARTIFACTORY_PASS')`
`6`	`6`	`CONAN_USER = 'oss'`
`7`		`- TARGET_BRANCH = 'v4'`
	`7`	`+ TARGET_BRANCH = 'main'`
`8`	`8`	`STABLE_BRANCH = 'stable/v*'`
`9`	`9`	`failed_pkg = ''`
`10`	`10`	`}`