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] Modernize GIFBUILDER example #824

Merged

Conversation

brotkrueml
Copy link
Contributor

The old example referred to some TypoScript configuration delivered with some ancient TYPO3 version (maybe from "css_styled_contents" system extension) in TYPO3 version 3 or 4. The current example is now independent from some outdated constant and uses fixed values. Additionally, the output image is added.

Releases: main, 12.4, 11.5

The old example referred to some TypoScript configuration
delivered with some ancient TYPO3 version (maybe CSS Styles Content)
in TYPO3 version 3 or 4. The current example is now independent
from some outdated constant and uses fixed values.

Releases: main, 12.4, 11.5
Copy link
Member

@linawolf linawolf left a comment

Choose a reason for hiding this comment

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

Cool!

@brotkrueml brotkrueml merged commit a623d35 into TYPO3-Documentation:main Oct 28, 2023
@brotkrueml brotkrueml deleted the modernize-gifbuilder-example branch October 28, 2023 13:13
@github-actions
Copy link

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 8d5fff8... [TASK] Modernize GIFBUILDER example
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".

stdout
Auto-merging Documentation/Gifbuilder/Gifbuilder/Index.rst
CONFLICT (content): Merge conflict in Documentation/Gifbuilder/Gifbuilder/Index.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-824-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 8d5fff8fc1600beabafc27de8fa12c6448b58807,51f7066a727da85be1905759dc9461429321e03d
# Push it to GitHub
git push --set-upstream origin backport-824-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-824-to-11.5.

@github-actions
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 8d5fff8... [TASK] Modernize GIFBUILDER example
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".

stdout
Auto-merging Documentation/Gifbuilder/Gifbuilder/Index.rst
CONFLICT (content): Merge conflict in Documentation/Gifbuilder/Gifbuilder/Index.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-824-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 8d5fff8fc1600beabafc27de8fa12c6448b58807,51f7066a727da85be1905759dc9461429321e03d
# Push it to GitHub
git push --set-upstream origin backport-824-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-824-to-12.4.

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-Typoscript that referenced this pull request Oct 28, 2023
…ion#824)

The old example referred to some TypoScript configuration
delivered with some ancient TYPO3 version (maybe CSS Styles Content)
in TYPO3 version 3 or 4. The current example is now independent
from some outdated constant and uses fixed values.

Releases: main, 12.4, 11.5
brotkrueml added a commit that referenced this pull request Oct 28, 2023
The old example referred to some TypoScript configuration
delivered with some ancient TYPO3 version (maybe CSS Styles Content)
in TYPO3 version 3 or 4. The current example is now independent
from some outdated constant and uses fixed values.

Releases: main, 12.4, 11.5
brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-Typoscript that referenced this pull request Oct 28, 2023
…ion#824)

The old example referred to some TypoScript configuration
delivered with some ancient TYPO3 version (maybe CSS Styles Content)
in TYPO3 version 3 or 4. The current example is now independent
from some outdated constant and uses fixed values.

Releases: main, 12.4, 11.5
brotkrueml added a commit that referenced this pull request Oct 28, 2023
The old example referred to some TypoScript configuration
delivered with some ancient TYPO3 version (maybe CSS Styles Content)
in TYPO3 version 3 or 4. The current example is now independent
from some outdated constant and uses fixed values.

Releases: main, 12.4, 11.5
@brotkrueml brotkrueml added backport-done Changes have been backported to other branches already and removed backport failed labels Oct 28, 2023
brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-Typoscript that referenced this pull request Oct 28, 2023
Proven by the example introduced with TYPO3-Documentation#824.

Releases: main, 12.4, 11.5
brotkrueml added a commit that referenced this pull request Oct 28, 2023
Proven by the example introduced with #824.

Releases: main, 12.4, 11.5
github-actions bot pushed a commit that referenced this pull request Oct 28, 2023
Proven by the example introduced with #824.

Releases: main, 12.4, 11.5
github-actions bot pushed a commit that referenced this pull request Oct 28, 2023
Proven by the example introduced with #824.

Releases: main, 12.4, 11.5
brotkrueml added a commit that referenced this pull request Oct 28, 2023
Proven by the example introduced with #824.

Releases: main, 12.4, 11.5

Co-authored-by: Chris Müller <2566282+brotkrueml@users.noreply.github.com>
brotkrueml added a commit that referenced this pull request Oct 28, 2023
Proven by the example introduced with #824.

Releases: main, 12.4, 11.5

Co-authored-by: Chris Müller <2566282+brotkrueml@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants