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 - Add embed base layers in the test project #4848

Merged
merged 3 commits into from
Oct 7, 2024

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Oct 7, 2024

Backport of #4846

@Gustry Gustry added run end2end If the PR must run end2end tests or not backport release_3_7 labels Oct 7, 2024
@github-actions github-actions bot added this to the 3.8.3 milestone Oct 7, 2024
@Gustry Gustry changed the title Embed layers Tests - Add embed base layers in the test project Oct 7, 2024
@Gustry Gustry merged commit 2f7b8f4 into 3liz:release_3_8 Oct 7, 2024
15 checks passed
@Gustry Gustry deleted the embed-layers branch October 7, 2024 14:06
@3liz-bot
Copy link
Contributor

3liz-bot commented Oct 7, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b79cbb355... Tests - Add embed base layers in the test project
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 tests/units/classes/Project/ProjectTest.php
CONFLICT (content): Merge conflict in tests/units/classes/Project/ProjectTest.php

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-4848-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick b79cbb3550a3a4774824959d81e9f580696c33e6,a11bcb2bc1e203d2d0dd794badb968ecfc32574a,5a3eed469050357920ec179bd6d7d70eb275f007
# Push it to GitHub
git push --set-upstream origin backport-4848-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-4848-to-release_3_7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 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