Skip to content

Align merge commit diff behavior with first-parent semantics in but-core and update regression coverage #16080

Align merge commit diff behavior with first-parent semantics in but-core and update regression coverage

Align merge commit diff behavior with first-parent semantics in but-core and update regression coverage #16080

Re-run triggered March 12, 2026 12:26
Status Success
Total duration 10m 6s
Artifacts 1

test-e2e-playwright.yml

on: pull_request
Fit to window
Zoom out
Zoom in

Annotations

3 errors, 1 warning, and 1 notice
[chromium] › playwright/tests/upstreamIntegration.spec.ts:48:1 › should handle the update of workspace with integrated branch gracefully: e2e/playwright/tests/upstreamIntegration.spec.ts#L67
2) [chromium] › playwright/tests/upstreamIntegration.spec.ts:48:1 › should handle the update of workspace with integrated branch gracefully Error: expect(locator).toHaveCount(expected) failed Locator: getByTestId('stack') Expected: 1 Received: 0 Timeout: 5000ms Call log: - Expect "toHaveCount" with timeout 5000ms - waiting for getByTestId('stack') 9 × locator resolved to 0 elements - unexpected value "0" 65 | // There should be one stack applied 66 | const stacks = getByTestId(page, "stack"); > 67 | await expect(stacks).toHaveCount(1); | ^ 68 | 69 | // Branch one was merged in the forge 70 | await gitbutler.runScript("merge-upstream-branch-to-base.sh", ["branch1"]); at /__w/gitbutler/gitbutler/e2e/playwright/tests/upstreamIntegration.spec.ts:67:23
[chromium] › playwright/tests/commitActions.spec.ts:85:1 › should be able to commit a bunch of times in a row and edit their message: e2e/playwright/src/util.ts#L17
1) [chromium] › playwright/tests/commitActions.spec.ts:85:1 › should be able to commit a bunch of times in a row and edit their message Error: locator.waitFor: Test timeout of 30000ms exceeded. Call log: - waiting for getByTestId('commit-row-context-menu-edit-message-menu-btn') to be visible at ../src/util.ts:17 15 | export async function waitForTestId(page: Page, testId: TestIdValues): Promise<Locator> { 16 | const element = getByTestId(page, testId); > 17 | await element.waitFor(); | ^ 18 | return element; 19 | } 20 | at waitForTestId (/__w/gitbutler/gitbutler/e2e/playwright/src/util.ts:17:16) at clickByTestId (/__w/gitbutler/gitbutler/e2e/playwright/src/util.ts:34:24) at startEditingCommitMessage (/__w/gitbutler/gitbutler/e2e/playwright/src/commit.ts:41:8) at amendCommitMessageMultipleTimes (/__w/gitbutler/gitbutler/e2e/playwright/tests/commitActions.spec.ts:318:3) at /__w/gitbutler/gitbutler/e2e/playwright/tests/commitActions.spec.ts:112:2
[chromium] › playwright/tests/commitActions.spec.ts:85:1 › should be able to commit a bunch of times in a row and edit their message: e2e/playwright/tests/commitActions.spec.ts#L0
1) [chromium] › playwright/tests/commitActions.spec.ts:85:1 › should be able to commit a bunch of times in a row and edit their message Test timeout of 30000ms exceeded.
e2e-playwright
Node.js 20 actions are deprecated. The following actions are running on Node.js 20 and may not work as expected: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020, eviden-actions/get-playwright-version@4ab3bd9361d018d7931275b5106f2290fa54cfb6, pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061, Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5. Actions will be forced to run with Node.js 24 by default starting June 2nd, 2026. Please check if updated versions of these actions are available that support Node.js 24. To opt into Node.js 24 now, set the FORCE_JAVASCRIPT_ACTIONS_TO_NODE24=true environment variable on the runner or in your workflow file. Once Node.js 24 becomes the default, you can temporarily opt out by setting ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true. For more information see: https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
🎭 Playwright Run Summary
2 flaky [chromium] › playwright/tests/commitActions.spec.ts:85:1 › should be able to commit a bunch of times in a row and edit their message [chromium] › playwright/tests/upstreamIntegration.spec.ts:48:1 › should handle the update of workspace with integrated branch gracefully 43 passed (4.2m)

Artifacts

Produced during runtime
Name Size Digest
playwright-report
67.2 MB
sha256:66f04af031e5500ae8069a0a8e2eee27dd7d87be7ffefb4c25874bae56c6a4cf