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

[BUGFIX] Correct the DDEV configuration command for the current version #400

Merged
merged 2 commits into from
Aug 1, 2024

Conversation

jpgreth
Copy link
Contributor

@jpgreth jpgreth commented Aug 1, 2024

The documented workflow doesn't work for ddev 1.23.3 anymore.
When the --php-version parameter is given, ddev doesn't ask for type and docroot.

Releases: main, 12.4, 11.5

@brotkrueml
Copy link
Contributor

@jpgreth Thanks for the fix 👍

@brotkrueml brotkrueml merged commit eaad459 into TYPO3-Documentation:main Aug 1, 2024
4 checks passed
Copy link

github-actions bot commented Aug 1, 2024

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply a4fecec... Small adjustments
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 Documentation/Installation/TutorialDdev.rst
[backport-400-to-11.5 3a5ee44] [BUGFIX] Correct the DDEV configuration command for the current version
 Author: Jan Greth <jg@medienpalast.net>
 Date: Thu Aug 1 22:16:08 2024 +0200
 1 file changed, 6 insertions(+), 3 deletions(-)
Auto-merging Documentation/Installation/TutorialDdev.rst
CONFLICT (content): Merge conflict in Documentation/Installation/TutorialDdev.rst

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

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

Copy link

github-actions bot commented Aug 1, 2024

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 774d010... [BUGFIX] Correct the DDEV configuration command for the current version
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 Documentation/Installation/TutorialDdev.rst
CONFLICT (content): Merge conflict in Documentation/Installation/TutorialDdev.rst

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

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

brotkrueml pushed a commit that referenced this pull request Aug 2, 2024
…on (#400)

Co-authored-by: Jan Greth <jg@medienpalast.net>
brotkrueml pushed a commit that referenced this pull request Aug 2, 2024
…on (#400)

Co-authored-by: Jan Greth <jg@medienpalast.net>
brotkrueml added a commit that referenced this pull request Aug 2, 2024
…on (#400) (#401)

Co-authored-by: Jan <jan@greth.me>
Co-authored-by: Jan Greth <jg@medienpalast.net>
brotkrueml added a commit that referenced this pull request Aug 2, 2024
…on (#400) (#402)

Co-authored-by: Jan <jan@greth.me>
Co-authored-by: Jan Greth <jg@medienpalast.net>
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