Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tests - Small helper to have a file path in Playwright #5387

Merged
merged 1 commit into from
Feb 10, 2025

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Feb 10, 2025

Follow up from #5376

@Gustry Gustry added tests unit tests and docker configuration for tests run end2end If the PR must run end2end tests or not backport release_3_8 backport release_3_9 labels Feb 10, 2025
@Gustry Gustry requested a review from rldhont February 10, 2025 11:18
@github-actions github-actions bot added this to the 3.10.0 milestone Feb 10, 2025
@Gustry Gustry merged commit d456053 into 3liz:master Feb 10, 2025
17 of 19 checks passed
@Gustry Gustry deleted the playwright-test-path-helper branch February 10, 2025 12:20
@3liz-bot
Copy link
Contributor

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 683c6821c... Tests - Small helper to have a file path in Playwright
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging tests/end2end/playwright/axis_orientation.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/axis_orientation.spec.js
Auto-merging tests/end2end/playwright/base-layers.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/base-layers.spec.js
Auto-merging tests/end2end/playwright/globals.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/globals.js
Auto-merging tests/end2end/playwright/print_in_project_projection.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/print_in_project_projection.spec.js
Auto-merging tests/end2end/playwright/webdav-upload.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/webdav-upload.spec.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-5387-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 683c6821c419df79de88cfb20ce16cd894c45a1c
# Push it to GitHub
git push --set-upstream origin backport-5387-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

Then, create a pull request where the base branch is release_3_8 and the compare/head branch is backport-5387-to-release_3_8.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_8 backport release_3_9 failed backport run end2end If the PR must run end2end tests or not tests unit tests and docker configuration for tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants