nielifeng commented on PR #11515: URL: https://github.com/apache/seatunnel/pull/11515#issuecomment-5336683184
Resolved the current `dev` conflict in merge commit `04f5bdab331f`. The resolution keeps the current upstream CI work while preserving this PR's remaining independent improvements: - Keeps the latest connector shard, benchmark, memory, and Windows command changes from `dev`. - Keeps this PR's scoped UI, dependency, backend-workflow, documentation, and impacted-module unit-test routing. - Keeps the attempt-aware CI summary artifact and job summary. - Uses the stronger workflow-job normalization merged in #11840 instead of retaining this branch's older duplicate implementation. - Retains this PR's `actions/github-script@v7` upgrade and check-runs pagination. Validation on the merged result: - All three workflow YAML files parse successfully. - Embedded `github-script` JavaScript passes syntax checks. - CI routing tool tests: 16 passed, 0 failed. - Conflict-marker and whitespace checks are clean. - The PR diff remains limited to the original three workflow files. A fresh Build has been triggered on the conflict-free head. -- 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]
