From df56810cef4f15f77d38a8b30c2250b1275b3f51 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 12:53:25 +0200 Subject: [PATCH 1/3] cicd: workflow_dispatch: #TASK-5092 --- .github/workflows/pull-request-merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 3e3e5bb46b9..cf334ca8ed6 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -7,6 +7,7 @@ on: - release-* types: - closed + workflow_dispatch: jobs: build: From ba5d9ec65ff731da2996b3caf1a9bc5ee12d5cbd Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 13:36:20 +0200 Subject: [PATCH 2/3] cicd: Pull Request Merge Workflow workflow_dispatch #TASK-5092 --- .github/workflows/pull-request-merge.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index cf334ca8ed6..7d6fcb8818f 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -3,18 +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 + uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@release-4.8.x + 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 + uses: opencb/java-common-libs/.github/workflows/delete-docker-hub-workflow.yml@release-4.8.x + needs: build with: cli: python3 ./build/cloud/docker/docker-build.py delete --images base --tag ${{ github.head_ref }} secrets: inherit From ce32db4042b07fd7fa60fc1927a67070f63ac871 Mon Sep 17 00:00:00 2001 From: JuanfeSanahuja Date: Wed, 4 Oct 2023 17:46:09 +0200 Subject: [PATCH 3/3] cicd: undo step by step #TASK-5092 --- .github/workflows/pull-request-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request-merge.yml b/.github/workflows/pull-request-merge.yml index 7d6fcb8818f..c3ca5077a33 100644 --- a/.github/workflows/pull-request-merge.yml +++ b/.github/workflows/pull-request-merge.yml @@ -11,12 +11,12 @@ on: jobs: build: - uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@release-4.8.x + 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@release-4.8.x + 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 }}