From f9cbf81d2c03ed694805d4759d02587bfc4afd93 Mon Sep 17 00:00:00 2001 From: LE SAULNIER Kevin Date: Tue, 20 Jan 2026 10:33:21 +0100 Subject: [PATCH 1/7] make dockerImage not required anymore - useful for multi-module repositories Signed-off-by: LE SAULNIER Kevin --- .github/workflows/build-backend-app-generic.yml | 4 ++-- .../workflows/manual-dockerdeploy-backend-app-generic.yml | 4 ++-- .github/workflows/patch-backend-app-generic.yml | 5 +++-- .github/workflows/release-backend-app-generic.yml | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-backend-app-generic.yml b/.github/workflows/build-backend-app-generic.yml index 2fc7cc2..8aa0021 100644 --- a/.github/workflows/build-backend-app-generic.yml +++ b/.github/workflows/build-backend-app-generic.yml @@ -2,7 +2,7 @@ on: workflow_call: inputs: dockerImage: - required: true + required: false type: string dockerUsername: required: true @@ -55,7 +55,7 @@ jobs: run: > mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 - -Djib.to.image="$RUNGHA_DOCKER_IMAGE" + ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKERHUB_TOKEN" env: diff --git a/.github/workflows/manual-dockerdeploy-backend-app-generic.yml b/.github/workflows/manual-dockerdeploy-backend-app-generic.yml index 07dc2b8..1e7137e 100644 --- a/.github/workflows/manual-dockerdeploy-backend-app-generic.yml +++ b/.github/workflows/manual-dockerdeploy-backend-app-generic.yml @@ -2,7 +2,7 @@ on: workflow_call: inputs: dockerImage: - required: true + required: false type: string dockerUsername: required: true @@ -78,7 +78,7 @@ jobs: run: > mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 - -Djib.to.image="$RUNGHA_DOCKER_IMAGE:$CURRENT_TAG_VERSION" + ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKER_RELEASE" env: diff --git a/.github/workflows/patch-backend-app-generic.yml b/.github/workflows/patch-backend-app-generic.yml index 2b9368c..6cd0193 100644 --- a/.github/workflows/patch-backend-app-generic.yml +++ b/.github/workflows/patch-backend-app-generic.yml @@ -5,7 +5,7 @@ on: required: true type: string dockerImage: - required: true + required: false type: string dockerUsername: required: true @@ -182,7 +182,8 @@ jobs: run: > mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 - -Djib.to.image="$RUNGHA_DOCKER_IMAGE:$GITHUB_SHORT_VERSION" + ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} + -Djib.to.tags="$GITHUB_SHORT_VERSION" -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKERHUB_TOKEN" env: diff --git a/.github/workflows/release-backend-app-generic.yml b/.github/workflows/release-backend-app-generic.yml index 1e01c5b..c720716 100644 --- a/.github/workflows/release-backend-app-generic.yml +++ b/.github/workflows/release-backend-app-generic.yml @@ -5,7 +5,7 @@ on: required: true type: string dockerImage: - required: true + required: false type: string dockerUsername: required: true @@ -234,7 +234,8 @@ jobs: run: > mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 - -Djib.to.image="$RUNGHA_DOCKER_IMAGE:$GITHUB_SHORT_VERSION" + ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} + -Djib.to.tags="$GITHUB_SHORT_VERSION" -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKERHUB_TOKEN" env: From c250299c2e385e16e000f1d8de29d1ad689aad9e Mon Sep 17 00:00:00 2001 From: LE SAULNIER Kevin Date: Tue, 20 Jan 2026 11:16:11 +0100 Subject: [PATCH 2/7] fix: allow docker build from test branch Signed-off-by: LE SAULNIER Kevin --- .github/workflows/build-backend-app-generic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-backend-app-generic.yml b/.github/workflows/build-backend-app-generic.yml index 8aa0021..56da494 100644 --- a/.github/workflows/build-backend-app-generic.yml +++ b/.github/workflows/build-backend-app-generic.yml @@ -51,7 +51,7 @@ jobs: RUNGHA_SONAR_PROJECT_KEY: ${{ inputs.sonarProjectKey }} # just for defense against script injection - name: Build Docker image - Main - if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/secret-test-remove-dockerimage' run: > mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 From 9cb66b2581c1dd401ede4e30e89a8561cf38cdc5 Mon Sep 17 00:00:00 2001 From: LE SAULNIER Kevin Date: Tue, 20 Jan 2026 12:58:42 +0100 Subject: [PATCH 3/7] fix job to work on test branch Signed-off-by: LE SAULNIER Kevin --- .github/workflows/build-backend-app-generic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-backend-app-generic.yml b/.github/workflows/build-backend-app-generic.yml index 56da494..67b366d 100644 --- a/.github/workflows/build-backend-app-generic.yml +++ b/.github/workflows/build-backend-app-generic.yml @@ -30,7 +30,7 @@ jobs: build: runs-on: ubuntu-latest environment: - name: ${{ github.ref == 'refs/heads/main' && inputs.environment || '' }} + name: ${{ github.ref == 'refs/heads/secret-test-remove-dockerimage' && inputs.environment || '' }} steps: - name: Set up JDK 21 uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1 v1.4.4 From 5a8a89b8a1f75adaec461404f957e02f8dfea948 Mon Sep 17 00:00:00 2001 From: LE SAULNIER Kevin Date: Tue, 20 Jan 2026 13:04:12 +0100 Subject: [PATCH 4/7] test with release version Signed-off-by: LE SAULNIER Kevin --- .github/workflows/build-backend-app-generic.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-backend-app-generic.yml b/.github/workflows/build-backend-app-generic.yml index 67b366d..e0d57f2 100644 --- a/.github/workflows/build-backend-app-generic.yml +++ b/.github/workflows/build-backend-app-generic.yml @@ -56,6 +56,7 @@ jobs: mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} + -Djib.to.tags="0.0.1" -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKERHUB_TOKEN" env: From 7690175c6818c82491ccbb6de73968b58d5571fd Mon Sep 17 00:00:00 2001 From: LE SAULNIER Kevin Date: Tue, 20 Jan 2026 13:16:14 +0100 Subject: [PATCH 5/7] remove test branch specification Signed-off-by: LE SAULNIER Kevin --- .github/workflows/build-backend-app-generic.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-backend-app-generic.yml b/.github/workflows/build-backend-app-generic.yml index e0d57f2..8aa0021 100644 --- a/.github/workflows/build-backend-app-generic.yml +++ b/.github/workflows/build-backend-app-generic.yml @@ -30,7 +30,7 @@ jobs: build: runs-on: ubuntu-latest environment: - name: ${{ github.ref == 'refs/heads/secret-test-remove-dockerimage' && inputs.environment || '' }} + name: ${{ github.ref == 'refs/heads/main' && inputs.environment || '' }} steps: - name: Set up JDK 21 uses: actions/setup-java@b6e674f4b717d7b0ae3baee0fbe79f498905dfde # v1 v1.4.4 @@ -51,12 +51,11 @@ jobs: RUNGHA_SONAR_PROJECT_KEY: ${{ inputs.sonarProjectKey }} # just for defense against script injection - name: Build Docker image - Main - if: github.ref == 'refs/heads/secret-test-remove-dockerimage' + if: github.ref == 'refs/heads/main' run: > mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} - -Djib.to.tags="0.0.1" -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKERHUB_TOKEN" env: From 77dbf295d52e3e723738913742db8340e5209074 Mon Sep 17 00:00:00 2001 From: LE SAULNIER Kevin Date: Wed, 21 Jan 2026 09:00:52 +0100 Subject: [PATCH 6/7] add missed tags option Signed-off-by: LE SAULNIER Kevin --- .github/workflows/manual-dockerdeploy-backend-app-generic.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manual-dockerdeploy-backend-app-generic.yml b/.github/workflows/manual-dockerdeploy-backend-app-generic.yml index 1e7137e..f942a44 100644 --- a/.github/workflows/manual-dockerdeploy-backend-app-generic.yml +++ b/.github/workflows/manual-dockerdeploy-backend-app-generic.yml @@ -79,6 +79,7 @@ jobs: mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} + -Djib.to.tags="$GITHUB_SHORT_VERSION" -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKER_RELEASE" env: From 5a7431aa62ea3acef96fbee42f3d2461c27df843 Mon Sep 17 00:00:00 2001 From: LE SAULNIER Kevin Date: Wed, 21 Jan 2026 10:51:35 +0100 Subject: [PATCH 7/7] remove jib.to.tags which would cause problems with patch Signed-off-by: LE SAULNIER Kevin --- .github/workflows/manual-dockerdeploy-backend-app-generic.yml | 3 +-- .github/workflows/patch-backend-app-generic.yml | 3 +-- .github/workflows/release-backend-app-generic.yml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/manual-dockerdeploy-backend-app-generic.yml b/.github/workflows/manual-dockerdeploy-backend-app-generic.yml index f942a44..c7f35ff 100644 --- a/.github/workflows/manual-dockerdeploy-backend-app-generic.yml +++ b/.github/workflows/manual-dockerdeploy-backend-app-generic.yml @@ -78,8 +78,7 @@ jobs: run: > mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 - ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} - -Djib.to.tags="$GITHUB_SHORT_VERSION" + ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE:$CURRENT_TAG_VERSION"} -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKER_RELEASE" env: diff --git a/.github/workflows/patch-backend-app-generic.yml b/.github/workflows/patch-backend-app-generic.yml index 6cd0193..0c30e68 100644 --- a/.github/workflows/patch-backend-app-generic.yml +++ b/.github/workflows/patch-backend-app-generic.yml @@ -182,8 +182,7 @@ jobs: run: > mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 - ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} - -Djib.to.tags="$GITHUB_SHORT_VERSION" + ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE:$GITHUB_SHORT_VERSION"} -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKERHUB_TOKEN" env: diff --git a/.github/workflows/release-backend-app-generic.yml b/.github/workflows/release-backend-app-generic.yml index c720716..2aec4a4 100644 --- a/.github/workflows/release-backend-app-generic.yml +++ b/.github/workflows/release-backend-app-generic.yml @@ -234,8 +234,7 @@ jobs: run: > mvn --batch-mode deploy -DskipTests -Dmaven.install.skip -Dmaven.deploy.skip -Dpowsybl.docker.deploy -Djib.httpTimeout=60000 - ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE"} - -Djib.to.tags="$GITHUB_SHORT_VERSION" + ${RUNGHA_DOCKER_IMAGE:+-Djib.to.image="$RUNGHA_DOCKER_IMAGE:$GITHUB_SHORT_VERSION"} -Djib.to.auth.username="$RUNGHA_DOCKER_USERNAME" -Djib.to.auth.password="$RUNGHA_DOCKERHUB_TOKEN" env: