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] List common configuration file locations as files #5283

Merged
merged 15 commits into from
Feb 2, 2025

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Feb 2, 2025

This uses the new rst feature TYPO3-Documentation/render-guides#898

Releases: main, 13.4, 12.4

@linawolf linawolf self-assigned this Feb 2, 2025
@linawolf linawolf added backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 labels Feb 2, 2025
@froemken froemken merged commit 07b0172 into main Feb 2, 2025
10 checks passed
@froemken froemken deleted the task/configuration branch February 2, 2025 12:32
Copy link
Contributor

github-actions bot commented Feb 2, 2025

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 90be85fb1... [TASK] List common configuration file locations as files
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 set advice.mergeConflict false"

stdout
Auto-merging Documentation/ExtensionArchitecture/FileStructure/Configuration/Extbase/Persistence/Index.rst
CONFLICT (content): Merge conflict in Documentation/ExtensionArchitecture/FileStructure/Configuration/Extbase/Persistence/Index.rst
Auto-merging Documentation/ExtensionArchitecture/FileStructure/Configuration/Index.rst
Auto-merging Documentation/ExtensionArchitecture/FileStructure/Configuration/PageTsconfig.rst
Auto-merging Documentation/ExtensionArchitecture/FileStructure/Configuration/TsConfig/Index.rst
CONFLICT (content): Merge conflict in Documentation/ExtensionArchitecture/FileStructure/Configuration/TsConfig/Index.rst
Auto-merging Documentation/ExtensionArchitecture/FileStructure/Configuration/TypoScript/Index.rst
CONFLICT (content): Merge conflict in Documentation/ExtensionArchitecture/FileStructure/Configuration/TypoScript/Index.rst
CONFLICT (modify/delete): Documentation/ExtensionArchitecture/FileStructure/Configuration/UserTsconfig.rst deleted in HEAD and modified in 90be85fb1 ([TASK] List common configuration file locations as files).  Version 90be85fb1 ([TASK] List common configuration file locations as files) of Documentation/ExtensionArchitecture/FileStructure/Configuration/UserTsconfig.rst left in tree.

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-5283-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 90be85fb1968f8d98bef832a601ae96e5af5c66e,8a85948aca3f5911fa1fc466f9512fee65c57db5,f7b8b827cd3d45fe70d39fa2dfa85191f63eae4a,9de3efc3448016eb189cb923d45ad6b4d0f7199f,e9e621d62e05c1fbbe3945770889d7326d8c7ac7,8c290cd74ceaa63e7ba84395453efb62e39041a0,a635947416cfaf63f5517de8e2e7c59d844fb946,294fb1dfe9dcf638675f46dbda41587e2ecc2d71,198d0eb110be53520d6f0880665a97ee63613d4a,078571a7e9a1d6158d0853de04c1ffd552dde1ac,2917277bb08b95f8006cd4bfef77e66962fa7ef2,ac35344fb641cddce9f0c54ebef8fba1f99c63dc,4834a0535f0afd711530145284463b7a8e20b7b2,228a3c2ab9124de13013e16c375aca611b805eec,6b9138b45bd5defc596d0feefe3265658b537b6c
# Push it to GitHub
git push --set-upstream origin backport-5283-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-5283-to-12.4.

froemken added a commit that referenced this pull request Feb 2, 2025
* [TASK] List common configuration file locations as files

This uses the new rst feature TYPO3-Documentation/render-guides#898

Releases: main, 13.4, 12.4

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/Backend/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/Backend/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/ContentSecurityPolicies.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/Extbase/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/ServicesYaml.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/ServicesYaml.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/ServicesYaml.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/RequestMiddlewaresPhp.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/TsConfig/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/TsConfig/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/TypoScript/Index.rst

* Apply suggestions from code review

Co-authored-by: Stefan Frömken <[email protected]>

* Apply suggestions from code review

Co-authored-by: Stefan Frömken <[email protected]>

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/TCA/Index.rst

---------

Co-authored-by: Stefan Frömken <[email protected]>
froemken added a commit that referenced this pull request Feb 2, 2025
* [TASK] List common configuration file locations as files

This uses the new rst feature TYPO3-Documentation/render-guides#898

Releases: main, 13.4, 12.4

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/Backend/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/Backend/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/ContentSecurityPolicies.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/Extbase/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/ServicesYaml.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/ServicesYaml.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/ServicesYaml.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/RequestMiddlewaresPhp.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/TsConfig/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/TsConfig/Index.rst

* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/TypoScript/Index.rst

* Apply suggestions from code review



* Apply suggestions from code review



* Update Documentation/ExtensionArchitecture/FileStructure/Configuration/TCA/Index.rst

---------

Co-authored-by: Lina Wolf <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 backport-done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants