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

Review E2E setup about tags and timeout on login page #5392

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Feb 10, 2025

Review E2E setup about tags and timeout on login page

@Gustry Gustry added run end2end If the PR must run end2end tests or not backport release_3_8 backport release_3_9 labels Feb 10, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Feb 10, 2025
@Gustry Gustry merged commit 7b37a69 into 3liz:master Feb 10, 2025
17 of 19 checks passed
@Gustry Gustry deleted the e2e branch February 10, 2025 16:07
@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 c8673dfa7... Review E2E setup about tags and timeout on login page
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 .github/workflows/e2e_tests.yml
CONFLICT (content): Merge conflict in .github/workflows/e2e_tests.yml
Auto-merging tests/end2end/playwright/auth.setup.ts

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-5392-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c8673dfa75d6ce0e8c263e1aa55f7e22ad6d58e4
# Push it to GitHub
git push --set-upstream origin backport-5392-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-5392-to-release_3_8.

@3liz-bot
Copy link
Contributor

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c8673dfa7... Review E2E setup about tags and timeout on login page
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 .github/workflows/e2e_tests.yml
CONFLICT (content): Merge conflict in .github/workflows/e2e_tests.yml

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

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

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