From 55df4975a2396d284ab664b1a05da75cc44384e8 Mon Sep 17 00:00:00 2001 From: Thilo Schwarz Date: Sat, 31 Oct 2026 11:30:46 +0100 Subject: [PATCH] - updated dependencies: jackson 3.2.4, httpclient5 5.6.4, lombok 1.18.48, logback-classic 1.6.6, mockito-junit-jupiter 5.24.0 - updated maven plugins: maven-compiler-plugin 3.16.0, maven-surefire-plugin 3.6.0, maven-jar-plugin 3.5.1 - jetbrains-annotations version moved to a property - ci: publish-report rebases instead of force pushing and only publishes on push events - add test report link to README.md - update test report Co-Authored-By: Claude Opus 5.5 --- .gitea/actions/publish-report/action.yml | 12 +++++++++++- README.md | 2 ++ changelog.md | 5 ++++- pom.xml | 23 ++++++++++++----------- reports/test.md | 8 ++++---- 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/.gitea/actions/publish-report/action.yml b/.gitea/actions/publish-report/action.yml index 62dcad5..519d632 100644 --- a/.gitea/actions/publish-report/action.yml +++ b/.gitea/actions/publish-report/action.yml @@ -111,6 +111,8 @@ runs: EOF - name: Commit Test-Report to Repo + # pull requests have no branch to push to (ref_name is e.g. "1/merge") + if: ${{ github.event_name == 'push' }} shell: bash env: GIT_USER: gitea-actions-bot @@ -125,4 +127,12 @@ runs: git add reports/ git diff --cached --quiet && echo "No changes" && exit 0 git commit -m "ci: update test report [skip ci]" - git push origin ${{ github.ref_name }} + # rebase onto commits pushed in the meantime instead of overwriting them; + # on conflicts in reports/ the freshly generated report wins + for attempt in 1 2 3; do + git pull --rebase --autostash -X theirs origin ${{ github.ref_name }} + git push origin ${{ github.ref_name }} && exit 0 + echo "Push rejected (attempt $attempt), retrying..." + sleep 5 + done + exit 1 diff --git a/README.md b/README.md index 0c18b90..5635142 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ [![Build and Analyse](https://git.mein-gateway.de/thischwa/CloudflareDNS-java/actions/workflows/build-and-analyse.yml/badge.svg?branch=develop)](https://git.mein-gateway.de/thischwa/CloudflareDNS-java/actions?workflow=build-and-analyse.yml) +[Test report](reports/test.md) + ## Preface This project provides a java client for minimalistic access to the Cloudflare API version 4, which is mainly used for diff --git a/changelog.md b/changelog.md index 2562882..2d97789 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,9 @@ # Changelog -- 0.5.0-SNAPSHOT: +- 0.6.0-SNAPSHOT: + - updated dependencies: jackson 3.2.4, httpclient5 5.6.4, lombok 1.18.48, logback-classic 1.6.6, mockito-junit-jupiter 5.24.0 + - updated maven plugins: maven-compiler-plugin 3.16.0, maven-surefire-plugin 3.6.0, maven-jar-plugin 3.5.1 +- 0.5.0: - moved the project to git.mein-gateway.de - replaced sonarqube with own actions - migrate to jackson 3.x diff --git a/pom.xml b/pom.xml index 3c91752..8c5013c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ codes.thischwa cloudflaredns - 0.5.0 + 0.6.0-SNAPSHOT CloudflareDNS-java 2025 jar @@ -36,21 +36,22 @@ false - 3.2.1 - 5.6.2 - 1.18.46 + 3.2.4 + 5.6.4 + 1.18.48 2.0.18 - 1.5.38 + 1.6.6 5.14.2 - 5.23.0 + 5.24.0 1.18.20.0 + 26.1.0 scm:git:https://git.mein-gateway.de/thischwa/CloudflareDNS-java.git scm:git:https://git.mein-gateway.de/thischwa/CloudflareDNS-java.git https://git.mein-gateway.de/thischwa/CloudflareDNS-java - v0.5.0 + HEAD @@ -102,7 +103,7 @@ org.jetbrains annotations - 26.1.0 + ${jetbrains-annotations.version} compile @@ -131,7 +132,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.16.0 ${java.version} ${java.version} @@ -220,7 +221,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.6 + 3.6.0 @@ -254,7 +255,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.5.0 + 3.5.1 attach-delomboked-sources diff --git a/reports/test.md b/reports/test.md index 9ff6ffa..29b69ca 100644 --- a/reports/test.md +++ b/reports/test.md @@ -1,6 +1,6 @@ # Test Report -_Generated on 2026-09-07 06:51:01 UTC_ +_Generated on 2026-10-31 10:23:10 UTC_ **✅ All tests passed** @@ -8,15 +8,15 @@ _Generated on 2026-09-07 06:51:01 UTC_ | | Tests | Passed | Failed | Skipped | |---|---|---|---|---| -| **Total** | 90 | 90 | 0 | 0 | +| **Total** | 105 | 90 | 0 | 15 | ### Details | Status | Suite | Tests | Passed | Failed | Skipped | |---|---|---|---|---|---| | ✅ | codes.thischwa.cf.CfBasicHttpClientTest | 9 | 9 | 0 | 0 | -| ✅ | codes.thischwa.cf.CfClientPenTest | 0 | 0 | 0 | 0 | -| ✅ | codes.thischwa.cf.CfClientTest | 0 | 0 | 0 | 0 | +| ✅ | codes.thischwa.cf.CfClientPenTest | 4 | 0 | 0 | 4 | +| ✅ | codes.thischwa.cf.CfClientTest | 11 | 0 | 0 | 11 | | ✅ | codes.thischwa.cf.CfDnsClientBuilderTest | 16 | 16 | 0 | 0 | | ✅ | codes.thischwa.cf.CfDnsClientMockTest | 16 | 16 | 0 | 0 | | ✅ | codes.thischwa.cf.CfRequestTest | 8 | 8 | 0 | 0 |