From da046310364f686d03a1b9fe4bdb789ae5c2cd2c Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Mon, 16 Sep 2024 17:17:10 +0200 Subject: [PATCH 1/4] SDLC: Prepare release 2.3.0 of Xetabase #TASK-6879 --- cellbase-app/pom.xml | 2 +- cellbase-client/pom.xml | 2 +- cellbase-core/pom.xml | 2 +- cellbase-lib/pom.xml | 2 +- cellbase-server/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cellbase-app/pom.xml b/cellbase-app/pom.xml index 4b05d287c..aed90e989 100644 --- a/cellbase-app/pom.xml +++ b/cellbase-app/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 6.2.2-SNAPSHOT + 6.3.0-SNAPSHOT ../pom.xml diff --git a/cellbase-client/pom.xml b/cellbase-client/pom.xml index f4ecc8458..7424c21bb 100644 --- a/cellbase-client/pom.xml +++ b/cellbase-client/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 6.2.2-SNAPSHOT + 6.3.0-SNAPSHOT ../pom.xml diff --git a/cellbase-core/pom.xml b/cellbase-core/pom.xml index 1a35c185c..7c74e13d9 100644 --- a/cellbase-core/pom.xml +++ b/cellbase-core/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 6.2.2-SNAPSHOT + 6.3.0-SNAPSHOT ../pom.xml diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml index c1ed6f6ba..a181ccf4a 100644 --- a/cellbase-lib/pom.xml +++ b/cellbase-lib/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 6.2.2-SNAPSHOT + 6.3.0-SNAPSHOT ../pom.xml diff --git a/cellbase-server/pom.xml b/cellbase-server/pom.xml index 2bee90c83..fe4509c6f 100644 --- a/cellbase-server/pom.xml +++ b/cellbase-server/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 6.2.2-SNAPSHOT + 6.3.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index f44762ec0..1b044e12f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.opencb.cellbase cellbase - 6.2.2-SNAPSHOT + 6.3.0-SNAPSHOT pom CellBase project From 9d8e015435f2f78740645df630fac3f7ada66403 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 17 Sep 2024 14:57:36 +0200 Subject: [PATCH 2/4] pom:update internal dependencies #TASK-6879 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1b044e12f..35498a9a4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,8 @@ ${project.version} - 5.2.2-SNAPSHOT - 3.2.2-SNAPSHOT + 5.3.0-SNAPSHOT + 3.3.0-SNAPSHOT 0.1.0 2.11.4 From 50a84765888b3691c8eb751bff8681a132eefd5c Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 17 Sep 2024 15:10:19 +0200 Subject: [PATCH 3/4] cicd scripts fix new branch and version references #TASK-6879 --- .github/workflows/scripts/get-xetabase-branch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/get-xetabase-branch.sh b/.github/workflows/scripts/get-xetabase-branch.sh index 16ae8c471..fd9626a79 100644 --- a/.github/workflows/scripts/get-xetabase-branch.sh +++ b/.github/workflows/scripts/get-xetabase-branch.sh @@ -19,11 +19,11 @@ get_xetabase_branch() { return 0 fi - # Check if the branch name starts with "release-" and follows the patterns "release-a.b.x" or "release-a.b.c.x" - if [[ "$input_branch" =~ ^release-([0-9]+)\.([0-9]+)\.x$ ]] || [[ "$input_branch" =~ ^release-([0-9]+)\.([0-9]+)\.([0-9]+)\.x$ ]]; then + # Check if the branch name starts with "release-" and follows the patterns "release-a.x.x" or "release-a.b.x" + if [[ "$input_branch" =~ ^release-([0-9]+)\.x\.x$ ]] || [[ "$input_branch" =~ ^release-([0-9]+)\.([0-9]+)\.x$ ]]; then # Extract the MAJOR part of the branch name MAJOR=${BASH_REMATCH[1]} - # Calculate the XETABASE_MAJOR by subtracting 3 from MAJOR + # Calculate the XETABASE_MAJOR by subtracting 4 from MAJOR of cellbase XETABASE_MAJOR=$((MAJOR - 4)) # Check if the XETABASE_MAJOR is negative if (( XETABASE_MAJOR < 0 )); then From 6a12f4c562b62c7749b4edf25af20a06d9ecd6e2 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Tue, 17 Sep 2024 15:13:21 +0200 Subject: [PATCH 4/4] cicd scripts fix new branch and version references #TASK-6879 --- .github/workflows/pull-request-approved.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request-approved.yml b/.github/workflows/pull-request-approved.yml index d339f65b9..ba378d3ab 100644 --- a/.github/workflows/pull-request-approved.yml +++ b/.github/workflows/pull-request-approved.yml @@ -24,7 +24,7 @@ jobs: chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh echo "github.event.pull_request.base.ref: ${{ github.event.pull_request.base.ref }}" echo "github.event.pull_request.head.ref: ${{ github.event.pull_request.head.ref }}" - xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.head.ref }}) + xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.base.ref }}) echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY} echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT env: