Merge branch 'develop' into TASK-4158

opencb · Oct 19, 2023 · f966697 · f966697
2 parents a16d6d8 + ce32db4
commit f966697
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml
@@ -3,17 +3,21 @@ name: "Pull Request Merge Workflow"
 on:
   pull_request:
     branches:
-      - develop
-      - release-*
+      - "develop"
+      - "release-*"
     types:
       - closed
+  workflow_dispatch:
 
 jobs:
   build:
     uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@develop
+    with:
+      maven_opts: -P storage-hadoop,hdp3.1,RClient,opencga-storage-hadoop-deps -Dopencga.war.name=opencga -Dcheckstyle.skip -pl '!:opencga-storage-hadoop-deps-emr6.1,!:opencga-storage-hadoop-deps-hdp2.6'
 
   delete-docker:
     uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@develop
+    needs: build
     with:
       cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }}
     secrets: inherit