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

Docker updates about mount #5203

Merged
merged 1 commit into from
Jan 16, 2025
Merged

Docker updates about mount #5203

merged 1 commit into from
Jan 16, 2025

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Jan 15, 2025

Minor changes from #5168, which were not strictly related to QJazz

@Gustry Gustry requested a review from dmarteau January 15, 2025 11:39
@Gustry Gustry added the run end2end If the PR must run end2end tests or not label Jan 15, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Jan 15, 2025
Copy link
Member

@dmarteau dmarteau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Gustry Gustry merged commit 7f92206 into 3liz:master Jan 16, 2025
22 checks passed
@Gustry Gustry deleted the docker-mount branch January 16, 2025 08:52
@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 e6886b700... Docker updates about mount
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 .gitlab-ci.yml
Auto-merging tests/docker-compose.yml
CONFLICT (content): Merge conflict in tests/docker-compose.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-5203-to-release_3_6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick e6886b700987b6cfe3639f229b8470d252d05866
# Push it to GitHub
git push --set-upstream origin backport-5203-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-5203-to-release_3_6.

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.

3 participants