From 05e0967a9f68851a0d50ece3cd563c24c29fe15d Mon Sep 17 00:00:00 2001 From: Thilo Schwarz Date: Mon, 9 Jun 2025 11:41:55 +0200 Subject: [PATCH] Improve Javadoc update logic in CI pipeline for conditional commits --- .gitlab-ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a99f43d..9585c26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,13 +74,18 @@ javadoc: - git config --global user.email "${GITLAB_USEREMAIL}" - git fetch origin ${CI_COMMIT_REF_NAME} - git checkout ${CI_COMMIT_REF_NAME} - script: - rm -rf docs/apidocs - mvn javadoc:javadoc -DskipTests -Pjavadoc - git add docs/apidocs - - git commit -m "Update Javadocs [skip ci]" || echo "No changes to commit" - - git push https://${GITLAB_USERNAME}:${CI_PUSH_TOKEN}@gitlab.com/th-schwarz/CloudflareDNS-java.git ${CI_COMMIT_REF_NAME} + - | + if ! git diff --quiet -- docs/apidocs; then + git add docs/apidocs + git commit -m "Update Javadocs" + git push https://${GITLAB_USERNAME}:${CI_PUSH_TOKEN}@gitlab.com/th-schwarz/CloudflareDNS-java.git ${CI_COMMIT_REF_NAME} + else + echo "No changes to commit" + fi when: manual rules: - if: '$CI_COMMIT_REF_NAME == "develop"' \ No newline at end of file