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
The following commit(s) were added to refs/heads/main by this push:
new 3acd5571f6 Revert Scalpel includePaths filtering (#8960)
3acd5571f6 is described below
commit 3acd5571f623c009dd4016e465f11ce2186ad72e
Author: James Netherton <[email protected]>
AuthorDate: Wed Aug 5 09:38:20 2026 +0100
Revert Scalpel includePaths filtering (#8960)
Revert the Scalpel includePaths approach for functional-extension-tests
as it causes full 1569-module reactor builds when includePaths filters
exclude all affected modules (e.g. changes in extensions-support/ don't
match extensions/**).
Keep the improved UPSTREAM category filter in detectFunctionalScope()
and shouldRunExamples() so that DOWNSTREAM and TRANSITIVE modules are
still considered for scope detection.
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.github/workflows/ci-build.yaml | 58 ++++++++++++-----------------------------
1 file changed, 16 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 2ad89d5a68..fbea36696d 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -200,7 +200,6 @@ 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"
@@ -543,7 +542,7 @@ jobs:
|| needs.initial-mvn-install.outputs.run-catalog-tests == 'true')
env:
MAVEN_OPTS: -Xmx3000m
- SCALPEL_TRIM_ARGS: "-Dscalpel.enabled=true -Dscalpel.mode=trim
-Dscalpel.alsoMake=false -Dscalpel.alsoMakeDependents=true"
+ SCALPEL_TRIM_ARGS: "-Dscalpel.enabled=true -Dscalpel.mode=trim
-Dscalpel.alsoMake=true -Dscalpel.alsoMakeDependents=false"
steps:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 #
v7.0.1
@@ -560,20 +559,15 @@ jobs:
with:
cache-key: ${{ needs.initial-mvn-install.outputs.cache-key }}
download-maven-repo: 'true'
- - name: extensions-core mvn test
+ - name: cd extensions-core && mvn test
if: needs.initial-mvn-install.outputs.run-extensions-core-tests ==
'true'
run: |
- 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} \
+ cd extensions-core
+ ../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
@@ -581,20 +575,15 @@ jobs:
if: ${{ failure() }}
with:
test-report-xml-base-dir: extensions-core
- - name: extensions mvn test
+ - name: cd extensions && mvn test
if: needs.initial-mvn-install.outputs.run-extensions-tests == 'true'
run: |
- MVNW="./mvnw"
- if [ "${{
needs.initial-mvn-install.outputs.incremental-build-enabled }}" != "true" ];
then
- cd extensions
- MVNW="../mvnw"
- fi
- ${MVNW} ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ cd extensions
+ ../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
@@ -602,20 +591,15 @@ jobs:
if: ${{ failure() }}
with:
test-report-xml-base-dir: extensions
- - name: test-framework mvn test
+ - name: cd test-framework && mvn test
if: needs.initial-mvn-install.outputs.run-test-framework-tests ==
'true'
run: |
- 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} \
+ cd test-framework
+ ../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
@@ -623,20 +607,15 @@ jobs:
if: ${{ failure() }}
with:
test-report-xml-base-dir: test-framework
- - name: tooling mvn verify
+ - name: cd tooling && mvn verify
if: needs.initial-mvn-install.outputs.run-tooling-tests == 'true'
run: |
- MVNW="./mvnw"
- if [ "${{
needs.initial-mvn-install.outputs.incremental-build-enabled }}" != "true" ];
then
- cd tooling
- MVNW="../mvnw"
- fi
- ${MVNW} ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ cd tooling
+ ../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
@@ -644,20 +623,15 @@ jobs:
if: ${{ failure() }}
with:
test-report-xml-base-dir: tooling
- - name: catalog mvn test
+ - name: cd catalog && mvn test
if: needs.initial-mvn-install.outputs.run-catalog-tests == 'true'
run: |
- MVNW="./mvnw"
- if [ "${{
needs.initial-mvn-install.outputs.incremental-build-enabled }}" != "true" ];
then
- cd catalog
- MVNW="../mvnw"
- fi
- ${MVNW} ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} \
+ cd catalog
+ ../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
