From 7c5214b3a53d5092fa62143f1fa06a5911aef34a Mon Sep 17 00:00:00 2001 From: dianomicbot Date: Tue, 17 Oct 2023 11:53:02 +0000 Subject: [PATCH 1/2] VERSION changed Signed-off-by: dianomicbot --- Jenkinsfile | 2 +- VERSION | 2 +- fledge.version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 843007c..67dbbdf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ timestamps { // Change to corresponding CORE_BRANCH as required // e.g. FOGL-xxxx, main etc. sh ''' - CORE_BRANCH='develop' + CORE_BRANCH='2.2.0RC' ${HOME}/buildFledge ${CORE_BRANCH} ${WORKSPACE} ''' } diff --git a/VERSION b/VERSION index 7ec1d6d..ccbccc3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0 +2.2.0 diff --git a/fledge.version b/fledge.version index 5c5c46f..78e4465 100644 --- a/fledge.version +++ b/fledge.version @@ -1 +1 @@ -fledge_version>=2.1 +fledge_version>=2.2 From 68549bc893d3b0c631e3768665887bd9dfd9fd72 Mon Sep 17 00:00:00 2001 From: dianomicbot Date: Fri, 20 Oct 2023 08:32:27 +0000 Subject: [PATCH 2/2] Updated branch in Jenkinsfile Signed-off-by: dianomicbot --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 67dbbdf..843007c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ timestamps { // Change to corresponding CORE_BRANCH as required // e.g. FOGL-xxxx, main etc. sh ''' - CORE_BRANCH='2.2.0RC' + CORE_BRANCH='develop' ${HOME}/buildFledge ${CORE_BRANCH} ${WORKSPACE} ''' }