Merge branch 'release-3.1.x'

opencb · May 21, 2024 · 51f0e85 · 51f0e85
2 parents 470c290 + 88adfba
commit 51f0e85
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 35 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,21 +7,49 @@ on:
   workflow_dispatch:
 
 jobs:
-  # Add the build-hdp and deploy-docker-hdp jobs
+  # Add the build-hdp job
   build-hdp:
     uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@develop
     with:
       maven_opts: -P hdp3.1,RClient -Dopencga.war.name=opencga -Dcheckstyle.skip
-      build_folder: build-folder-hdp
+      build_folder: build-folder
 
+  # Add the deploy-docker-hdp job that depends on the build-hdp job
   deploy-docker-hdp:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: build-hdp
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag ${{ needs.build-hdp.outputs.version }}
-      build_folder: build-folder-hdp
+      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag "${{ needs.build-hdp.outputs.version }}-hdp3.1"
+      build_folder: build-folder
     secrets: inherit
 
+  # Add the deploy-maven and deploy-python jobs they depend on the build-hdp job
+#  deploy-maven:
+#    uses: opencb/java-common-libs/.github/workflows/deploy-maven-repository-workflow.yml@develop
+#    needs: build-hdp
+#    with:
+#      maven_opts: -P hdp3.1 -Dopencga.war.name=opencga
+#    secrets: inherit
+#
+#  deploy-python:
+#    uses: opencb/java-common-libs/.github/workflows/deploy-python-workflow.yml@develop
+#    needs: build-hdp
+#    with:
+#      cli: ./clients/python/python-build.sh push
+#      artifact: build-folder
+#    secrets: inherit
+
+  # Add the release job that depends on all the previous jobs
+  release:
+    uses: opencb/java-common-libs/.github/workflows/release-github-workflow.yml@develop
+    needs: [ build-hdp, deploy-docker-hdp]
+    with:
+      artifact: build-folder
+      file: |
+        opencga-client-${{ needs.build-hdp.outputs.version }}.tar.gz
+        clients/R/opencgaR_${{ needs.build-hdp.outputs.version }}.tar.gz
+
+  # Compile and deploy other hadoop flavours
   # Add the build-hdi and deploy-docker-hdi jobs
   build-hdi:
     uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@develop
@@ -33,7 +61,7 @@ jobs:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: build-hdi
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag ${{ needs.build-hdi.outputs.version }}
+      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag "${{ needs.build-hdi.outputs.version }}-hdi5.1"
       build_folder: build-folder-hdi
     secrets: inherit
 
@@ -48,7 +76,7 @@ jobs:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: build-emr
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag ${{ needs.build-emr.outputs.version }}
+      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag "${{ needs.build-emr.outputs.version }}-emr6.1"
       build_folder: build-folder-emr
     secrets: inherit
 
@@ -63,33 +91,6 @@ jobs:
     uses: opencb/java-common-libs/.github/workflows/deploy-docker-hub-workflow.yml@develop
     needs: build-emr613
     with:
-      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag ${{ needs.build-emr613.outputs.version }}
+      cli: python3 ./build/cloud/docker/docker-build.py push --images base,init --tag "${{ needs.build-emr613.outputs.version }}-emr6.13"
       build_folder: build-folder-emr613
     secrets: inherit
-
-  # Add the deploy-maven and deploy-python jobs they depend on the build-hdp job
-#  deploy-maven:
-#    uses: opencb/java-common-libs/.github/workflows/deploy-maven-repository-workflow.yml@develop
-#    needs: build-hdp
-#    with:
-#      maven_opts: -P hdp3.1 -Dopencga.war.name=opencga
-#    secrets: inherit
-
-#  deploy-python:
-#    uses: opencb/java-common-libs/.github/workflows/deploy-python-workflow.yml@develop
-#    needs: build-hdp
-#    with:
-#      cli: ./clients/python/python-build.sh push
-#      artifact: build-folder
-#    secrets: inherit
-
-  # Add the release job that depends on all the previous jobs
-  release:
-    uses: opencb/java-common-libs/.github/workflows/release-github-workflow.yml@develop
-    needs: [ build-hdp, deploy-docker-hdp, build-hdi, deploy-docker-hdi, build-emr, deploy-docker-emr, build-emr613, deploy-docker-emr613 ]
-    with:
-      artifact: build-folder-hdp
-      file: |
-        opencga-client-${{ needs.build-hdp.outputs.version }}.tar.gz
-        clients/R/opencgaR_${{ needs.build-hdp.outputs.version }}.tar.gz
-
diff --git a/pom.xml b/pom.xml
@@ -45,7 +45,7 @@
     <properties>
         <pyopencga.version>3.1.0</pyopencga.version>
         <opencgar.version>3.1.0</opencgar.version>
-        <cellbase.version>6.0.0</cellbase.version>
+        <cellbase.version>6.1.0</cellbase.version>
         <biodata.version>3.1.0</biodata.version>
         <java-common-libs.version>5.1.0</java-common-libs.version>
         <iva.version>3.1.0</iva.version>