Merge branch 'develop' into TASK-7610

Author: pfurio

.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

@@ -1,4 +1,4 @@
-name: Reusable workflow to push in DockerHub
+name: Reusable workflow to push in opencb DockerHub
 
 on:
   workflow_call:
@@ -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
@@ -43,5 +43,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          logout: true
       - name: Deploy in Docker Hub
-        run: ${{ inputs.cli }}
+        run: ${{ inputs.cli }} --org opencb

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

@@ -15,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,7 +18,7 @@ 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 }}

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

@@ -0,0 +1,49 @@
+name: Reusable workflow to push in DockerHub
+
+on:
+  workflow_call:
+    inputs:
+      cli:
+        type: string
+        required: true
+      repository:
+        type: string
+        required: false
+      branch:
+        type: string
+        required: false
+      build_folder:
+        type: string
+        required: false
+        default: "build-folder"
+    secrets:
+      DOCKER_HUB_USER:
+        required: true
+      DOCKER_HUB_PASSWORD:
+        required: true
+
+jobs:
+  deploy-docker-hub:
+    name: Push Docker image
+    runs-on: ubuntu-22.04
+    steps:
+      - name: "Checkout optional repo"
+        uses: actions/checkout@v4
+        if: inputs.repository != '' && inputs.branch != ''
+        with:
+          repository: ${{ inputs.repository }}
+          ref: ${{ inputs.branch }}
+      - uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.build_folder }}
+          path: build
+      - name: Chmod
+        run: "find build -regex '.*sh' | while read file ; do chmod u+x $file ; done"
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.ZETTA_DOCKER_HUB_USER }}
+          password: ${{ secrets.ZETTA_DOCKER_HUB_PASSWORD }}
+          logout: true
+      - name: Deploy in Docker Hub
+        run: ${{ inputs.cli }} --org zettagenomics
+

.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

@@ -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:

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

@@ -13,7 +13,7 @@ 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 }}