diff --git a/.github/workflows/pull-request-approved.yml b/.github/workflows/pull-request-approved.yml
index d339f65b..ba378d3a 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:
diff --git a/.github/workflows/scripts/get-xetabase-branch.sh b/.github/workflows/scripts/get-xetabase-branch.sh
index a1eb7e52..781e29a3 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 1 from MAJOR
XETABASE_MAJOR=$((MAJOR - 1))
# Check if the XETABASE_MAJOR is negative
if (( XETABASE_MAJOR < 0 )); then
diff --git a/biodata-external/pom.xml b/biodata-external/pom.xml
index 87218dda..d6d1acdd 100644
--- a/biodata-external/pom.xml
+++ b/biodata-external/pom.xml
@@ -6,7 +6,7 @@
biodata
org.opencb.biodata
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/biodata-formats/pom.xml b/biodata-formats/pom.xml
index 67e13301..c3332c2e 100644
--- a/biodata-formats/pom.xml
+++ b/biodata-formats/pom.xml
@@ -22,7 +22,7 @@
org.opencb.biodata
biodata
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/biodata-models/pom.xml b/biodata-models/pom.xml
index 68804eb5..7325a383 100644
--- a/biodata-models/pom.xml
+++ b/biodata-models/pom.xml
@@ -22,7 +22,7 @@
org.opencb.biodata
biodata
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/biodata-tools/pom.xml b/biodata-tools/pom.xml
index dc8bf9a4..e8d90ada 100644
--- a/biodata-tools/pom.xml
+++ b/biodata-tools/pom.xml
@@ -22,7 +22,7 @@
org.opencb.biodata
biodata
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index cf8a2ba6..6dc030db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.opencb.biodata
biodata
- 3.2.2-SNAPSHOT
+ 3.3.0-SNAPSHOT
pom
Biodata
@@ -38,7 +38,7 @@
- 5.2.2-SNAPSHOT
+ 5.3.0-SNAPSHOT
2.14.3
4.4