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 - Fix project home page cypress, moving to playwright #5399

Merged
merged 1 commit into from
Feb 11, 2025

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Feb 11, 2025

Tests - Fix project home page cypress, moving to playwright

@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 11, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Feb 11, 2025
@Gustry Gustry merged commit c5324ab into 3liz:master Feb 11, 2025
20 of 27 checks passed
@Gustry Gustry deleted the test-homepahe branch February 11, 2025 14:46
@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 cd7e3984b... Tests - Fix project home page cypress, moving to 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/cypress/integration/projects_homepage-ghaction.js
Auto-merging tests/end2end/playwright/landing_page_config.spec.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/landing_page_config.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-5399-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick cd7e3984bfcfa2e64f3abcc7eafec7daf578325a
# Push it to GitHub
git push --set-upstream origin backport-5399-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-5399-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.

2 participants