This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 47becad6e6bfce8d2ecd6feaab11990f2a656efd Author: James Netherton <[email protected]> AuthorDate: Fri Jul 31 07:51:50 2026 +0100 Use Scalpel includePaths for functional extension tests Co-Authored-By: Claude Opus 4.6 <[email protected]> --- .github/workflows/ci-build.yaml | 56 ++++++++++++++++------ .../camel/quarkus/maven/IncrementalBuildMojo.java | 5 +- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 0442087ef4..ad7ee863ff 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -200,6 +200,7 @@ jobs: run-integration-tests-jvm: ${{ steps.process-incremental.outputs.run-integration-tests-jvm }} run-test-framework-tests: ${{ steps.process-incremental.outputs.run-test-framework-tests }} run-tooling-tests: ${{ steps.process-incremental.outputs.run-tooling-tests }} + incremental-build-enabled: ${{ steps.process-incremental.outputs.use-incremental }} env: MAVEN_OPTS: -Xmx4600m SCALPEL_ENABLED: "-Dscalpel.enabled=true" @@ -559,15 +560,20 @@ jobs: with: cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }} download-maven-repo: 'true' - - name: cd extensions-core && mvn test + - name: extensions-core mvn test if: needs.initial-mvn-install.outputs.run-extensions-core-tests == 'true' run: | - cd extensions-core - ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ + MVNW="./mvnw" + if [ "${{ needs.initial-mvn-install.outputs.incremental-build-enabled }}" != "true" ]; then + cd extensions-core + MVNW="../mvnw" + fi + ${MVNW} ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ ${CQ_MAVEN_SKIP_CHECKS} \ ${SCALPEL_TRIM_ARGS} \ ${SCALPEL_FULL_BUILD_TRIGGERS} \ ${SCALPEL_EXCLUDE_PATHS} \ + -Dscalpel.includePaths=extensions-core/** \ --fail-at-end \ test - name: Report test failures @@ -575,15 +581,20 @@ jobs: if: ${{ failure() }} with: test-report-xml-base-dir: extensions-core - - name: cd extensions && mvn test + - name: extensions mvn test if: needs.initial-mvn-install.outputs.run-extensions-tests == 'true' run: | - cd extensions - ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ + MVNW="./mvnw" + if [ "${{ needs.initial-mvn-install.outputs.incremental-build-enabled }}" != "true" ]; then + cd extensions + MVNW="../mvnw" + fi + ${MVNW} ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ ${CQ_MAVEN_SKIP_CHECKS} \ ${SCALPEL_TRIM_ARGS} \ ${SCALPEL_FULL_BUILD_TRIGGERS} \ ${SCALPEL_EXCLUDE_PATHS} \ + -Dscalpel.includePaths=extensions/** \ --fail-at-end \ test - name: Report test failures @@ -591,15 +602,20 @@ jobs: if: ${{ failure() }} with: test-report-xml-base-dir: extensions - - name: cd test-framework && mvn test + - name: test-framework mvn test if: needs.initial-mvn-install.outputs.run-test-framework-tests == 'true' run: | - cd test-framework - ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ + MVNW="./mvnw" + if [ "${{ needs.initial-mvn-install.outputs.incremental-build-enabled }}" != "true" ]; then + cd test-framework + MVNW="../mvnw" + fi + ${MVNW} ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ ${CQ_MAVEN_SKIP_CHECKS} \ ${SCALPEL_TRIM_ARGS} \ ${SCALPEL_FULL_BUILD_TRIGGERS} \ ${SCALPEL_EXCLUDE_PATHS} \ + -Dscalpel.includePaths=test-framework/** \ --fail-at-end \ test - name: Report test failures @@ -607,15 +623,20 @@ jobs: if: ${{ failure() }} with: test-report-xml-base-dir: test-framework - - name: cd tooling && mvn verify + - name: tooling mvn verify if: needs.initial-mvn-install.outputs.run-tooling-tests == 'true' run: | - cd tooling - ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ + MVNW="./mvnw" + if [ "${{ needs.initial-mvn-install.outputs.incremental-build-enabled }}" != "true" ]; then + cd tooling + MVNW="../mvnw" + fi + ${MVNW} ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ ${CQ_MAVEN_SKIP_CHECKS} \ ${SCALPEL_TRIM_ARGS} \ ${SCALPEL_FULL_BUILD_TRIGGERS} \ ${SCALPEL_EXCLUDE_PATHS} \ + -Dscalpel.includePaths=tooling/** \ --fail-at-end \ verify - name: Report test failures @@ -623,15 +644,20 @@ jobs: if: ${{ failure() }} with: test-report-xml-base-dir: tooling - - name: cd catalog && mvn test + - name: catalog mvn test if: needs.initial-mvn-install.outputs.run-catalog-tests == 'true' run: | - cd catalog - ../mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ + MVNW="./mvnw" + if [ "${{ needs.initial-mvn-install.outputs.incremental-build-enabled }}" != "true" ]; then + cd catalog + MVNW="../mvnw" + fi + ${MVNW} ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \ ${CQ_MAVEN_SKIP_CHECKS} \ ${SCALPEL_TRIM_ARGS} \ ${SCALPEL_FULL_BUILD_TRIGGERS} \ ${SCALPEL_EXCLUDE_PATHS} \ + -Dscalpel.includePaths=catalog/** \ test - name: Report test failures uses: ./.github/actions/test-summary-report diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/IncrementalBuildMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/IncrementalBuildMojo.java index 5977ea46d6..4122f8f3b1 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/IncrementalBuildMojo.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/IncrementalBuildMojo.java @@ -610,7 +610,7 @@ public class IncrementalBuildMojo extends AbstractMojo { for (Map<String, Object> module : report.affectedModules) { String category = (String) module.get("category"); - if (!"DIRECT".equals(category)) { + if ("UPSTREAM".equals(category)) { continue; } @@ -678,8 +678,7 @@ public class IncrementalBuildMojo extends AbstractMojo { String path = (String) module.get("path"); String category = (String) module.get("category"); - // Only consider DIRECT changes - if (!"DIRECT".equals(category)) { + if ("UPSTREAM".equals(category)) { continue; }
