Merge pull request #277 from opencb/TASK-6879

TASK-6879 - Adapt GitHub Actions, CICD workflows and release scripts to new SDLC
opencb · Sep 19, 2024 · d77f216 · d77f216
2 parents 09fd3c3 + 6a20e30
commit d77f216
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>biodata</artifactId>
         <groupId>org.opencb.biodata</groupId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-formats/pom.xml b/biodata-formats/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-models/pom.xml b/biodata-models/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-tools/pom.xml b/biodata-tools/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>3.2.2-SNAPSHOT</version>
+        <version>3.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>org.opencb.biodata</groupId>
     <artifactId>biodata</artifactId>
-    <version>3.2.2-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Biodata</name>
@@ -38,7 +38,7 @@
 
     <properties>
         <!-- All dependency versions must be defined here -->
-        <java-common-libs.version>5.2.2-SNAPSHOT</java-common-libs.version>
+        <java-common-libs.version>5.3.0-SNAPSHOT</java-common-libs.version>
 
         <jackson.version>2.14.3</jackson.version>
         <collections.version>4.4</collections.version>