ErikBPF commented on PR #6113: URL: https://github.com/apache/datafusion-comet/pull/6113#issuecomment-6799263194
Merged current `main` (`e59d93730`) into this branch at head `cc9fa7e6c` and revalidated the shard work against #7311 (fork PR tier), #7516 (Spark SQL 4.1 / Iceberg 1.11 on every PR) and #7521 (Spark 3.4 removal). The conflict was again limited to `dev/ci/check-ci-config.py`, where both sides appended checks. The extensions job still uses the shared shard matrix, passes `-PcometShardTask` for its own task and the shard index/count from the same definition, and `iceberg-spark-extensions-shard-coverage` still verifies the extensions inventories. The contributor-guide edits merged cleanly and are reconciled with the current workflow shape. Verification on the merged head: `python3 dev/ci/check-ci-config.py`, `dev/ci/test-iceberg-shards.py` (15 tests), `dev/ci/test-fork-push-changed-files.py` and `dev/ci/test-fork-ci-status.cjs` passed. The Gradle/JUnit shard fixture was not rerun here because it needs the Iceberg checkout; the earlier run remains the runtime evidence. GitHub now reports the PR mergeable with the approval retained. Ready for re-review. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
