Merge pull request #718 from opencb/TASK-7214

Port patch 6.4.0 -> 7.0.0

.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.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/pull-request-merge.yml

@@ -10,7 +10,20 @@ on:
 
 jobs:
   delete-docker:
-    uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@develop
-    with:
-      cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }}
-    secrets: inherit
+    name: Execute delete docker image
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: '10'
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      - name: Delete in Docker Hub
+        run: |
+          echo "Deleting docker image ${{ github.head_ref }}"
+          python3 ./cellbase-app/app/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }}
+
+
+

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

@@ -3,35 +3,36 @@
 # Function to calculate the corresponding branch of Xetabase project
 get_xetabase_branch() {
   # Input parameter (branch name)
-  input_branch="$1"
+  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 4 from MAJOR of cellbase
-    XETABASE_MAJOR=$((MAJOR - 4))
+    # Calculate the XETABASE_MAJOR by subtracting 1 from MAJOR of opencga
+    XETABASE_MAJOR=$((MAJOR - 1))
     # Check if the XETABASE_MAJOR is negative
     if (( XETABASE_MAJOR < 0 )); then
       echo "Error: 'MAJOR' digit after subtraction results in a negative number."
       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,10 +42,11 @@ get_xetabase_branch() {
 }
 
 # Check if the script receives exactly one argument
-if [ "$#" -ne 1 ]; then
-  echo "Usage: $0 <branch-name>"
+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"