This is an automated email from the ASF dual-hosted git repository. twolf pushed a commit to branch dev_3.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit ae7edfca45f158052652629db2669c9977fca323 Author: Thomas Wolf <tw...@apache.org> AuthorDate: Mon Apr 21 20:18:29 2025 +0200 [releng] Fix site building Skip reports completely, ensure the site is _not_ deployed via maven-site-plugin (we use maven-scm-publish-plugin to push the site to branch gh-pages), and fix the build step in the Github workflow that publishes to gh-pages. --- .github/workflows/next-build.yml | 6 +++--- sshd-site/pom.xml | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/next-build.yml b/.github/workflows/next-build.yml index e04bf3d94..c9bc9093f 100644 --- a/.github/workflows/next-build.yml +++ b/.github/workflows/next-build.yml @@ -73,11 +73,11 @@ jobs: run: | export PROJECT_VERSION=$(mvn -B -q -DforceStdout -Dexpression=project.version help:evaluate) echo "Project version: $PROJECT_VERSION" - [[ "$PROJECT_VERSION" =~ ^3\.[0-9]+\.[0-9]+-SNAPSHOT$ ]] || [[ "$PROJECT_VERSION" =~ ^3\.[0-9]+\.[0-9]+-M[1-9]$ ]] || { + [[ "$PROJECT_VERSION" =~ ^3\.[0-9]+\.[0-9]+-SNAPSHOT$ ]] || [[ "$PROJECT_VERSION" =~ ^3\.[0-9]+\.[0-9]+-M[0-9]$ ]] || { echo "**** Skipping deployment because not a snapshot version: $PROJECT_VERSION" 1>&2 echo "SKIP_DEPLOYMENT=true" >> "$GITHUB_ENV" } - if [[ "$PROJECT_VERSION" =~ ^3\.[0-9]+\.[0-9]+-M[1-9]$ ]]; then + if [[ "$PROJECT_VERSION" =~ ^3\.[0-9]+\.[0-9]+-M[0-9]$ ]]; then echo "DEPLOY_WEBSITE=true" >> "$GITHUB_ENV" fi @@ -114,4 +114,4 @@ jobs: git config --global user.name '${{ github.actor }}' git config --global user.email '41898282+${{ github.actor }}@users.noreply.github.com' mvn -B --no-transfer-progress -DskipTests -Pjapicmp clean install - mvn scm-publish:publish-scm -rf :sshd-site + mvn scm-publish:publish-scm diff --git a/sshd-site/pom.xml b/sshd-site/pom.xml index 2ab2bfeed..8dcf918ef 100644 --- a/sshd-site/pom.xml +++ b/sshd-site/pom.xml @@ -128,6 +128,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> + <configuration> + <!-- We deploy using maven-scm-publish-plugin in the GitHub workflow. --> + <skipDeploy>true</skipDeploy> + </configuration> <executions> <!-- Assemble the site --> <execution> @@ -138,6 +142,7 @@ </goals> <configuration> <siteDirectory>${project.build.directory}/src/site</siteDirectory> + <generateReports>false</generateReports> </configuration> </execution> <!-- And finally stage it -->