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

[FEATURE] Add environment configuration section #357

Merged
merged 14 commits into from
Mar 7, 2024

Conversation

garvinhicking
Copy link
Contributor

No description provided.

@garvinhicking
Copy link
Contributor Author

(Can be reviewed :) )

Copy link
Contributor Author

@garvinhicking garvinhicking left a comment

Choose a reason for hiding this comment

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

Thanks for reviewing, addressed hopefully all of them.

@garvinhicking garvinhicking requested a review from brotkrueml March 7, 2024 08:57
Copy link
Contributor

@brotkrueml brotkrueml left a comment

Choose a reason for hiding this comment

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

Good work 👍

@garvinhicking garvinhicking merged commit 0c8c0f7 into main Mar 7, 2024
8 checks passed
@garvinhicking garvinhicking deleted the feature-environment-configuration branch March 7, 2024 15:05
Copy link
Contributor

github-actions bot commented Mar 7, 2024

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-357-to-12.4
You are currently cherry-picking commit 14ccacd.
  (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-357-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 14ccacd617b99a9c17d4c709b216a1943820ddad,ae31f86b455f6c460c3fd475ebd6f24d9e3eaf5c,c1962145fe5834f05132d864d7257d7fd87ac3c7,f04fc9176f5063febb331bf5899a18c693602af8,1728ff77624c67585c991c786c557573570f7fb9,c2d6cbd409fe11cb2670e551b441ca9ccbf0ba05,572b2948b6184d8a3d7c98d2feacfff44b3d9061,c944ed3205fccfca7a6748669f88d9e43d424087,87af7321182c0e72858fa29687eed6e14b93fe23,c0422bea650dca88c16e73093256c9fdbdaf3ffa,0267e29f0cd49bf95f0d2d3b4460ac0ccd10bf24,45e5a49b131bf4289869d09f8cc8f707fc3aa767,85b50d477ad48ef1268379b390ac366f0a1fccb5,1cc0613f5ea2b997dc50f8cc54a56508de4ae083
# Push it to GitHub
git push --set-upstream origin backport-357-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-357-to-12.4.

@garvinhicking
Copy link
Contributor Author

(Manually backported directly to 12.4, it applied clean)

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