Skip to content

test: verify CI behavior for conflicting PR#14776

Closed
JSerFeng wants to merge 1 commit into
mainfrom
fy/conflict-pr-demo
Closed

test: verify CI behavior for conflicting PR#14776
JSerFeng wants to merge 1 commit into
mainfrom
fy/conflict-pr-demo

Conversation

@JSerFeng

Copy link
Copy Markdown
Contributor

Summary

  • Starts as a normal, mergeable comment-only pull request.
  • A subsequent push replaces the head with a commit that intentionally conflicts with current main.
  • Used to verify whether CI runs for the pull_request synchronize event when the PR has a merge conflict.
  • This is an intentional CI fixture and should not be merged.

Related links

Validation

  • Initial head: git diff --check passes and the PR is mergeable.
  • Conflict head: git merge-tree --write-tree HEAD origin/main reports a content conflict in crates/rspack_plugin_esm_library/src/link.rs.

Checklist

  • Tests not required (comment-only conflict fixture).
  • Documentation not required.

@JSerFeng JSerFeng force-pushed the fy/conflict-pr-demo branch from 3e26a29 to 62541ab Compare July 14, 2026 05:13
@github-actions

github-actions Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

📝 Benchmark detail: Open

Name Base (1d04823) Current Change
10000_big_production-mode_disable-minimize + exec 12 s ± 265 ms 12.1 s ± 340 ms +0.57 %
10000_development-mode + exec 887 ms ± 20 ms 885 ms ± 6.7 ms -0.16 %
10000_development-mode_hmr + stats 157 ms ± 8.5 ms 160 ms ± 20 ms +2.14 %
10000_development-mode_noop-loader + exec 1.76 s ± 106 ms 1.75 s ± 50 ms -0.81 %
10000_production-mode + exec 1.01 s ± 11 ms 1 s ± 26 ms -1.14 %
10000_production-mode_persistent-cold + exec 1.2 s ± 13 ms 1.18 s ± 12 ms -1.57 %
10000_production-mode_persistent-hot + exec 633 ms ± 8.1 ms 629 ms ± 4.2 ms -0.69 %
10000_production-mode_source-map + exec 1.18 s ± 68 ms 1.18 s ± 31 ms -0.15 %
arco-pro_development-mode + exec 1.29 s ± 57 ms 1.3 s ± 85 ms +0.70 %
arco-pro_development-mode_hmr + stats 34 ms ± 3.9 ms 33 ms ± 0.68 ms -3.07 %
arco-pro_production-mode + exec 2.37 s ± 134 ms 2.34 s ± 85 ms -0.91 %
arco-pro_production-mode_generate-package-json-webpack-plugin + exec 2.42 s ± 116 ms 2.42 s ± 126 ms +0.29 %
arco-pro_production-mode_persistent-cold + exec 2.39 s ± 79 ms 2.47 s ± 191 ms +3.48 %
arco-pro_production-mode_persistent-hot + exec 348 ms ± 8.2 ms 344 ms ± 7.1 ms -1.09 %
arco-pro_production-mode_source-map + exec 2.79 s ± 117 ms 2.83 s ± 187 ms +1.21 %
arco-pro_production-mode_source-map_persistent-cold + exec 2.92 s ± 140 ms 2.92 s ± 83 ms +0.17 %
arco-pro_production-mode_source-map_persistent-hot + exec 478 ms ± 7.1 ms 477 ms ± 15 ms -0.04 %
arco-pro_production-mode_traverse-chunk-modules + exec 2.39 s ± 126 ms 2.36 s ± 91 ms -1.29 %
bundled-threejs_development-mode + exec 182 ms ± 7.1 ms 183 ms ± 6.7 ms +0.77 %
bundled-threejs_production-mode + exec 209 ms ± 6.9 ms 211 ms ± 6.5 ms +0.86 %
large-dyn-imports_development-mode + exec 1.18 s ± 40 ms 1.18 s ± 50 ms -0.47 %
large-dyn-imports_production-mode + exec 1.29 s ± 59 ms 1.27 s ± 46 ms -1.44 %
threejs_development-mode_10x + exec 779 ms ± 39 ms 787 ms ± 25 ms +1.05 %
threejs_development-mode_10x_hmr + stats 109 ms ± 3.6 ms 111 ms ± 6.2 ms +2.02 %
threejs_production-mode_10x + exec 2.83 s ± 38 ms 2.83 s ± 33 ms +0.18 %
threejs_production-mode_10x_persistent-cold + exec 2.94 s ± 17 ms 2.95 s ± 45 ms +0.26 %
threejs_production-mode_10x_persistent-hot + exec 405 ms ± 91 ms 381 ms ± 9.6 ms -5.88 %
threejs_production-mode_10x_source-map + exec 3.64 s ± 124 ms 3.65 s ± 119 ms +0.28 %
10000_big_production-mode_disable-minimize + rss memory 2215 MiB ± 39.2 MiB 2210 MiB ± 62.1 MiB -0.26 %
10000_development-mode + rss memory 548 MiB ± 15.1 MiB 546 MiB ± 7.51 MiB -0.45 %
10000_development-mode_hmr + rss memory 788 MiB ± 31.3 MiB 768 MiB ± 39.4 MiB -2.62 %
10000_development-mode_noop-loader + rss memory 817 MiB ± 9.15 MiB 816 MiB ± 23.5 MiB -0.20 %
10000_production-mode + rss memory 473 MiB ± 12.1 MiB 474 MiB ± 3.21 MiB +0.19 %
10000_production-mode_persistent-cold + rss memory 670 MiB ± 14 MiB 669 MiB ± 8.39 MiB -0.02 %
10000_production-mode_persistent-hot + rss memory 662 MiB ± 26.4 MiB 654 MiB ± 29.2 MiB -1.18 %
10000_production-mode_source-map + rss memory 485 MiB ± 23.3 MiB 481 MiB ± 18.7 MiB -0.71 %
arco-pro_development-mode + rss memory 407 MiB ± 2.11 MiB 406 MiB ± 3.53 MiB -0.07 %
arco-pro_development-mode_hmr + rss memory 432 MiB ± 9.68 MiB 428 MiB ± 2.73 MiB -0.90 %
arco-pro_production-mode + rss memory 585 MiB ± 3.11 MiB 582 MiB ± 4.68 MiB -0.58 %
arco-pro_production-mode_generate-package-json-webpack-plugin + rss memory 602 MiB ± 7.56 MiB 593 MiB ± 14.9 MiB -1.48 %
arco-pro_production-mode_persistent-cold + rss memory 673 MiB ± 32.3 MiB 663 MiB ± 10.5 MiB -1.40 %
arco-pro_production-mode_persistent-hot + rss memory 301 MiB ± 4.65 MiB 288 MiB ± 6.15 MiB -4.23 %
arco-pro_production-mode_source-map + rss memory 683 MiB ± 5.56 MiB 683 MiB ± 17.9 MiB -0.06 %
arco-pro_production-mode_source-map_persistent-cold + rss memory 820 MiB ± 20.8 MiB 813 MiB ± 1.82 MiB -0.84 %
arco-pro_production-mode_source-map_persistent-hot + rss memory 425 MiB ± 9.09 MiB 421 MiB ± 20.9 MiB -1.14 %
arco-pro_production-mode_traverse-chunk-modules + rss memory 587 MiB ± 12 MiB 576 MiB ± 11.5 MiB -1.92 %
bundled-threejs_development-mode + rss memory 129 MiB ± 7.7 MiB 126 MiB ± 8.04 MiB -2.40 %
bundled-threejs_production-mode + rss memory 138 MiB ± 4.54 MiB 137 MiB ± 3.7 MiB -1.19 %
large-dyn-imports_development-mode + rss memory 557 MiB ± 11.2 MiB 556 MiB ± 9.5 MiB -0.16 %
large-dyn-imports_production-mode + rss memory 408 MiB ± 6.32 MiB 407 MiB ± 4.83 MiB -0.41 %
threejs_development-mode_10x + rss memory 438 MiB ± 4.57 MiB 436 MiB ± 11.4 MiB -0.36 %
threejs_development-mode_10x_hmr + rss memory 600 MiB ± 9.17 MiB 596 MiB ± 17.7 MiB -0.67 %
threejs_production-mode_10x + rss memory 616 MiB ± 22.4 MiB 610 MiB ± 13.9 MiB -1.10 %
threejs_production-mode_10x_persistent-cold + rss memory 574 MiB ± 1.68 MiB 570 MiB ± 6.52 MiB -0.70 %
threejs_production-mode_10x_persistent-hot + rss memory 377 MiB ± 15.9 MiB 375 MiB ± 13.6 MiB -0.55 %
threejs_production-mode_10x_source-map + rss memory 742 MiB ± 10.5 MiB 726 MiB ± 25.7 MiB -2.03 %

Base persistent cache hit rate: 👍

Current persistent cache hit rate: 👍

@github-actions

Copy link
Copy Markdown
Contributor

📦 Binary Size-limit

Comparing 3e26a29 to perf: optimize ESM linking passes (#14758) by Fy

⏳ The base commit triggered a linux binding build, but its binary size data has not been generated yet, so the size comparison is skipped.

Please re-run this workflow once the ecosystem-benchmark data for that commit is published.

Warning

Reference only — not the real baseline. The base commit's data isn't ready yet, so this compares against the nearest earlier commit that has data (1d04823) for a rough estimate:

🙈 Size remains the same at 66.53MB

@codspeed-hq

codspeed-hq Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

Merging this PR will improve performance by 3.85%

⚠️ Different runtime environments detected

Some benchmarks with significant performance changes were compared across different runtime environments,
which may affect the accuracy of the results.

Open the report in CodSpeed to investigate

⚡ 1 improved benchmark
✅ 42 untouched benchmarks
⏩ 47 skipped benchmarks1

Performance Changes

Mode Benchmark BASE HEAD Efficiency
Simulation rust@create_concatenate_module 15 ms 14.5 ms +3.85%

Tip

Curious why this is faster? Comment @codspeedbot explain why this is faster on this PR, or directly use the CodSpeed MCP with your agent.


Comparing fy/conflict-pr-demo (3e26a29) with main (10840b8)

Open in CodSpeed

Footnotes

  1. 47 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

@JSerFeng JSerFeng closed this Jul 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant