From 59703feaa69ab2f68d973648f8aed70106eed637 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Sun, 6 Oct 2024 10:05:40 +0100 Subject: [PATCH] Move whitebox testing to a profile * Use release instead of source/target in pom.xml * Split install and site in CI --- .github/website.sh | 5 + .github/workflows/build.yml | 12 +- pom.xml | 276 ++++++++++++++++++++++-------------- src/site/site.xml | 2 +- 4 files changed, 185 insertions(+), 110 deletions(-) diff --git a/.github/website.sh b/.github/website.sh index 145dee8..c9263e1 100644 --- a/.github/website.sh +++ b/.github/website.sh @@ -21,4 +21,9 @@ git commit --message "Update joda-money from CI: $GITHUB_ACTION" echo "## push..." git push origin main +echo "## tidy..." +cd .. +git push --delete origin website || true +git push --delete origin website2x || true + echo "## done" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b25a45e..a78a58d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + with: + token: ${{ secrets.PERSONAL_TOKEN_GH }} - name: Set up JDK uses: actions/setup-java@v4 @@ -43,14 +45,18 @@ jobs: uses: github/codeql-action/init@v3 with: languages: java - + - name: Maven build run: | - mvn install site + mvn install -Dextended-test - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 - + + - name: Maven site + run: | + mvn clean site + - name: Website if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/website') || startsWith(github.ref, 'refs/tags/v')) env: diff --git a/pom.xml b/pom.xml index 1f84463..df5ed29 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ - + 4.0.0 org.joda @@ -100,6 +100,38 @@ + + + org.apache.maven.plugins + maven-clean-plugin + + + clean-mess + initialize + + clean + + + true + + + src/test/java + + module-info.java + + + + target/test-classes + false + + module-info.class + + + + + + + org.apache.maven.plugins @@ -123,103 +155,6 @@ - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - default-test - - test - - - false - - - - - test-module-classpath - - test - - test - - true - - - - - - - test-module-whitebox - - test - - integration-test - - --patch-module org.joda.money=src/main/resources - - - - - - - - - - com.coderplus.maven.plugins - copy-rename-maven-plugin - ${copy-rename-maven-plugin.version} - - - activate-module-info - pre-integration-test - - copy - - - src/test-whitebox/module-info.java - src/test/java/module-info.java - - - - deactivate-module-info - post-integration-test - - rename - - - src/test/java/module-info.java - src/test-whitebox/module-info.java - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - test-module-whitebox - - testCompile - - pre-integration-test - - - - org.apache.felix @@ -664,6 +599,136 @@ + + + + + + + + + + extended-test + + + extended-test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + default-test + + test + + + true + + + + + test-module-classpath + + test + + test + + false + + + + + + + test-module-whitebox + + test + + integration-test + + --patch-module org.joda.money=src/main/resources + + + + + + + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + ${copy-rename-maven-plugin.version} + + + activate-module-info + pre-integration-test + + copy + + + src/test-whitebox/module-info.java + src/test/java/module-info.java + + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + deactivate-module-info + post-integration-test + + clean + + + true + + + src/test/java + + module-info.java + + + + target/test-classes + false + + module-info.class + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + test-module-whitebox + + testCompile + + pre-integration-test + + + + + + intellij-idea @@ -715,9 +780,9 @@ - + - release-basics + release-artifacts oss.repo @@ -820,7 +885,7 @@ org.joda.money.* - osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${maven.compiler.source}))" + osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${maven.compiler.release}))" true @@ -833,14 +898,14 @@ 3.1.3 3.8.0 3.5.0 - 3.2.6 + 3.2.7 3.1.3 3.4.2 - 3.10.0 + 3.10.1 3.5.0 3.15.0 3.25.0 - 3.7.0 + 3.6.2 3.1.1 2.4 3.3.1 @@ -859,8 +924,7 @@ 4.8.6.4 - 21 - 21 + 21 true diff --git a/src/site/site.xml b/src/site/site.xml index b22d84f..2ae587f 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -82,7 +82,7 @@ - +