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

[TASK] Move automatic deployment to TYPO3 explained #501

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Oct 25, 2024

Chapter needs more love in general: #498

Manually backported to 12.4

Releases: main, 13.4, 12.4

Chapter needs more love in general: #498

Releases: main, 13.4, 12.4
@linawolf linawolf self-assigned this Oct 25, 2024
@linawolf linawolf merged commit 4d7727d into main Oct 25, 2024
9 checks passed
@linawolf linawolf deleted the task/deployment branch October 25, 2024 03:47
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

stdout
Auto-merging Documentation/Installation/DeployTYPO3.rst
On branch backport-501-to-12.4
You are currently cherry-picking commit 7772afa.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

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-501-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 7772afaac485473a872605cf3309502598071b62
# Push it to GitHub
git push --set-upstream origin backport-501-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-501-to-12.4.

linawolf added a commit that referenced this pull request Dec 15, 2024
Chapter needs more love in general: #498

Releases: main, 13.4, 12.4

(cherry picked from commit 4d7727d)
linawolf added a commit that referenced this pull request Dec 15, 2024
Chapter needs more love in general: #498

Releases: main, 13.4, 12.4

(cherry picked from commit 4d7727d)
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.

2 participants