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 - Improve Playright tests with works and tags #5239

Merged
merged 1 commit into from
Jan 20, 2025

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Jan 20, 2025

No description provided.

@github-actions github-actions bot added this to the 3.10.0 milestone Jan 20, 2025
@Gustry Gustry force-pushed the e2e-tests branch 4 times, most recently from 4563b59 to aadb204 Compare January 20, 2025 15:03
@Gustry Gustry marked this pull request as ready for review January 20, 2025 15:39
@Gustry Gustry merged commit e30a5b7 into 3liz:master Jan 20, 2025
16 checks passed
@3liz-bot
Copy link
Contributor

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 5c9bcce06... Tests - Improve Playright tests with works and tags
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 advice.mergeConflict false"

stdout
Auto-merging .github/workflows/e2e_tests.yml
Auto-merging tests/README.md
CONFLICT (content): Merge conflict in tests/README.md

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_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-5239-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 5c9bcce0603a0509ef9df20d23bf0fb812af2b39
# Push it to GitHub
git push --set-upstream origin backport-5239-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants