From 6f077eaa763243f5e000f1b4ba78b8b018f8156c Mon Sep 17 00:00:00 2001 From: dianomicbot Date: Tue, 9 Jan 2024 11:28:33 +0000 Subject: [PATCH 1/3] Updated branch in Jenkinsfile Signed-off-by: dianomicbot --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6dc754a..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.3.0RC' + CORE_BRANCH='develop' ${HOME}/buildFledge ${CORE_BRANCH} ${WORKSPACE} ''' } From fc273ccc8a6b41aaeef82a12f2098bf2d7caa489 Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Thu, 4 Apr 2024 10:58:56 +0000 Subject: [PATCH 2/3] FOGL-8636 add keywords Signed-off-by: Mark Riddoch --- docs/keywords | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/keywords diff --git a/docs/keywords b/docs/keywords new file mode 100644 index 0000000..2352b86 --- /dev/null +++ b/docs/keywords @@ -0,0 +1 @@ +Structure,Augmentation,Labelling From 6201da6c945df77947716f7c782db2fc7b42888b Mon Sep 17 00:00:00 2001 From: dianomicbot Date: Wed, 10 Apr 2024 12:04:11 +0000 Subject: [PATCH 3/3] 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..62a67cd 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.4.0RC' ${HOME}/buildFledge ${CORE_BRANCH} ${WORKSPACE} ''' } diff --git a/VERSION b/VERSION index 276cbf9..197c4d5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.0 +2.4.0 diff --git a/fledge.version b/fledge.version index a8fe6ed..a339210 100644 --- a/fledge.version +++ b/fledge.version @@ -1 +1 @@ -fledge_version>=2.3 +fledge_version>=2.4