Merge branch 'release-6.x.x' into TASK-7843

Author: juanfeSanahuja

.github/workflows/build-java-app-workflow.yml

@@ -18,7 +18,7 @@ on:
 jobs:
   build-workflow:
     name: Build Java app
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.UBUNTU_VERSION }}
     outputs:
       version: ${{ steps.get_project_version.outputs.version }}
     steps:

.github/workflows/delete-docker-hub-workflow.yml

@@ -15,7 +15,7 @@ on:
 jobs:
   delete-docker-hub:
     name: Delete Docker Hub image
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.UBUNTU_VERSION }}
     steps:
       - uses: docker/login-action@v2
         with:

.github/workflows/deploy-docker-hub-workflow.yml

@@ -25,7 +25,7 @@ on:
 jobs:
   deploy-docker-hub:
     name: Push Docker image
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.UBUNTU_VERSION }}
     steps:
       - name: "Checkout optional repo"
         uses: actions/checkout@v4

.github/workflows/deploy-maven-repository-workflow.yml

@@ -7,10 +7,6 @@ on:
         type: string
         required: false
     secrets:
-      MAVEN_NEXUS_USER:
-        required: true
-      MAVEN_NEXUS_PASSWORD:
-        required: true
       MAVEN_GPG_PASSPHRASE:
         required: true
       MAVEN_GPG_PRIVATE_KEY:
@@ -19,7 +15,7 @@ on:
 jobs:
   deploy-workflow:
     name: Deploy to Maven and GitHub Packages
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.UBUNTU_VERSION }}
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/deploy-python-workflow.yml

@@ -18,14 +18,18 @@ on:
 jobs:
   pypi:
     name: Deploy Python package in PyPI
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.UBUNTU_VERSION }}
     steps:
       - uses: actions/download-artifact@v4
         if: ${{ inputs.artifact }}
         with:
           name: ${{ inputs.artifact }}
       - name: Chmod
         run: chmod +x ./clients/python/*sh
+      - name: Upgrade pip tools to compatible versions
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade setuptools packaging
       - name: Build Python package for PyPI
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_TWINE_USER }}

.github/workflows/manual-deploy-maven.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   checkout:
     name: Build Java app
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.UBUNTU_VERSION }}
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/publish-test-report-workflow.yml

@@ -1,4 +1,4 @@
-name: Reusable workflow to push in DockerHub
+name: Publish test report workflow
 
 on:
   workflow_call:
@@ -22,7 +22,7 @@ on:
 jobs:
   publish-test-report:
     name: Publish test report
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.UBUNTU_VERSION }}
     steps:
       - uses: actions/download-artifact@v4
         with:

.github/workflows/pull-request-approved.yml

@@ -9,7 +9,7 @@ jobs:
   calculate-xetabase-branch:
     if: github.event.review.state == 'approved'
     name: Calculate Xetabase branch
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.UBUNTU_VERSION }}
     outputs:
       xetabase_branch: ${{ steps.get_xetabase_branch.outputs.xetabase_branch }}
     steps:
@@ -26,7 +26,7 @@ jobs:
           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 }}"
           echo "secrets.ZETTA_REPO_ACCESS_TOKEN: ${{ secrets.ZETTA_REPO_ACCESS_TOKEN }}"
-          xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.base.ref }})
+          xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.base.ref }} ${{ github.event.pull_request.head.ref }})
           echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY}
           echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT
         env:

.github/workflows/release-github-workflow.yml

@@ -13,14 +13,14 @@ on:
 jobs:
   release-workflow:
     name: Create GitHub Release
-    runs-on: ubuntu-22.04
+    runs-on: ${{ vars.UBUNTU_VERSION }}
     steps:
       - uses: actions/download-artifact@v4
         if: ${{ inputs.artifact }}
         with:
           name: ${{ inputs.artifact }}
       - name: GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           name: ${{ github.ref_name }}

.github/workflows/scripts/get-xetabase-branch.sh

@@ -4,24 +4,26 @@ set -x
 # Function to calculate the corresponding branch of Xetabase project
 get_xetabase_branch() {
   # Input parameter (branch name)
-  input_branch="$1"
+  # Input parameter (branch name)
+  target_branch="$1"
+  current_branch="$2"
 
   # If the branch begins with 'TASK' and exists in the opencga-enterprise repository, I return it
-  if [[ $input_branch == TASK* ]]; then
-    if [ "$(git ls-remote "https://$ZETTA_REPO_ACCESS_TOKEN@github.com/zetta-genomics/opencga-enterprise.git" "$input_branch" )" ] ; then
-      echo $input_branch;
+  if [[ $current_branch == TASK* ]]; then
+    if [ "$(git ls-remote "https://$ZETTA_REPO_ACCESS_TOKEN@github.com/zetta-genomics/opencga-enterprise.git" "$current_branch" )" ] ; then
+      echo "$current_branch";
       return 0;
     fi
   fi
 
   # Check if the branch name is "develop" in that case return the same branch name
-  if [[ "$input_branch" == "develop" ]]; then
+  if [[ "$target_branch" == "develop" ]]; then
     echo "develop"
     return 0
   fi
 
   # 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
+  if [[ "$target_branch" =~ ^release-([0-9]+)\.x\.x$ ]] || [[ "$target_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
@@ -32,7 +34,7 @@ get_xetabase_branch() {
       return 1
     fi
     # Construct and echo the new branch name
-    echo "release-$XETABASE_MAJOR.${input_branch#release-$MAJOR.}"
+    echo "release-$XETABASE_MAJOR.${target_branch#release-$MAJOR.}"
     return 0
   fi
 
@@ -41,6 +43,11 @@ get_xetabase_branch() {
   return 1
 }
 
+# Check if the script receives exactly one argument
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 <target-branch> <current-branch>"
+  exit 1
+fi
 
 # Call the function with the input branch name
-get_xetabase_branch "$1"
+get_xetabase_branch "$1" "$2"