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

GH Action - Review order of steps #3976

Merged
merged 1 commit into from
Nov 23, 2023
Merged

GH Action - Review order of steps #3976

merged 1 commit into from
Nov 23, 2023

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Nov 23, 2023

The order was not logical, according to make env

@Gustry Gustry added run end2end If the PR must run end2end tests or not backport release_3_6 labels Nov 23, 2023
@Gustry Gustry self-assigned this Nov 23, 2023
@github-actions github-actions bot added this to the 3.7.0 milestone Nov 23, 2023
@Gustry Gustry marked this pull request as ready for review November 23, 2023 13:42
@Gustry Gustry merged commit 640e1d1 into 3liz:master Nov 23, 2023
12 checks passed
@Gustry Gustry deleted the e2e-workflow branch November 23, 2023 13:42
@3liz-bot
Copy link
Contributor

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1b28d0ae4... GH Action - Review order of steps
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".

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

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

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

Successfully merging this pull request may close these issues.

2 participants