Skip to content

Commit

Permalink
[TASK] Adapt to 13.4 release (#372)
Browse files Browse the repository at this point in the history
  • Loading branch information
garvinhicking authored Oct 19, 2024
1 parent 5af7abc commit 73386d3
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Documentation/Appendix/CommitMessage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Here is an example of a final commit message. The `Change-Id` will be generated
Resolves: #12346
Related: #12340
Releases: main, 12.4
Releases: main, 13.4
Change-Id: I<some string generated by the git commit-msg hook>
You can see that a commit message consists of several parts, let's go over them step by step:
Expand Down Expand Up @@ -256,7 +256,7 @@ Relationships
.. code-block:: text
:caption: commit message
Releases: main, 12.4, 11.5
Releases: main, 13.4, 12.4
Always make sure the target version does indeed exist, when in doubt, as in the coredev channel on Slack_.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/BugfixingAZ/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ as described in :ref:`setup <setup>` (or via the
Some descriptions with line length of max. 72 characters
Resolves: #12346
Releases: main, 12.4
Releases: main, 13.4
Only create one commit. Do not create a branch. Work on main.

Expand Down
16 changes: 8 additions & 8 deletions Documentation/CheatSheets/Git.rst
Original file line number Diff line number Diff line change
Expand Up @@ -165,19 +165,19 @@ Show all branches:
git branch -a
Checkout 12.4 branch:
Checkout 13.4 branch:

.. code-block:: bash
:caption: shell command
git checkout 12.4
git checkout 13.4
Checkout 11.5 branch:
Checkout 12.4 branch:

.. code-block:: bash
:caption: shell command
git checkout 11.5
git checkout 12.4
.. important::
Expand All @@ -190,19 +190,19 @@ Checkout 11.5 branch:
Long story short: In most cases, **push to main**. The rest is being taken
care of by core team members!

Push 12.4 branch:
Push 13.4 branch:

.. code-block:: bash
:caption: shell command
git push origin HEAD:refs/for/12.4
git push origin HEAD:refs/for/13.4
Push 11.5 branch:
Push 12.4 branch:

.. code-block:: bash
:caption: shell command
git push origin HEAD:refs/for/11.5
git push origin HEAD:refs/for/12.4
Workflow - commit msg
Expand Down
2 changes: 1 addition & 1 deletion Documentation/CoreMergers/Backport.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Manual backport
===============

If the automatic backport fails, you need to manually cherry-pick the patch to the target branch. (e.g. cherry-pick the
main patch onto your local (up to date) 12.4 branch) You will most likely need to adjust the code for the older branch.
main patch onto your local (up to date) 13.4 branch) You will most likely need to adjust the code for the older branch.

Edit the commit message to comply to the guidelines again. (e.g. remove the Reviewed-* and Tested-* lines added by Gerrit)

Expand Down
4 changes: 2 additions & 2 deletions Documentation/HandlingAPatch/FindAReview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ linking issue and patch reviews, for example:
.. code-block::
[TASK] Provide PSR-7 Request in PolicyMutatedEvent
For additional context does the PolicyMutatedEvent
now provide the current PSR-7 Request.
Resolves: #104141
Releases: main, 12.4
Releases: main, 13.4
Change-Id: I1817366e77f20f6c43eef0ee209fbb419e7237e2
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84913
Tested-by: Lorem Ipsum <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/ReportingAnIssue/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ A good bug report should contain all or any of these elements:
the bug it *might* include your operating system
(Windows, Linux, macOS, ...), the full version of TYPO3 and PHP, the webserver
used, the database used (MySQL, MariaDB, ...) and its version.
In any case, the full version of TYPO3 (e.g. 12.4.16) is very helpful. If
your bug is reproducible on several versions (e.g. 13.2.1 and 12.4.16),
In any case, the full version of TYPO3 (e.g. 12.4.22) is very helpful. If
your bug is reproducible on several versions (e.g. 13.4.0 and 12.4.22),
that is helpful as well.
* A description of the TYPO3 setup that you are using or that is necessary
to trigger the bug. Your issue came out using TYPO3 with multiple
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Setup/Git/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ First, create a file, for example :file:`~/.gitmessage.txt`.
[BUGFIX|TASK|FEATURE]
Resolves: #
Releases: main, 12.4
Releases: main, 13.4
Make Git use this file as a template for the commit message:

Expand Down
4 changes: 2 additions & 2 deletions Documentation/Testing/History.rst
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,10 @@ core testing paved the way for new opportunities and TYPO3 usages.
====

TYPO3 currently uses 4 dedicated "bare bone" Servers to perform CI tasks. This hardware performs
11.513 unit tets in ~15 seconds. A typical pre-merge pipeline runtime is at ~5 minutes with 2 permutations
11.513 unit tests in ~15 seconds. A typical pre-merge pipeline runtime is at ~5 minutes with 2 permutations
of acceptance tests, 3 permutations of ~7500 functional tests, 3 permutations of unit tests plus
statical code analysis, linting, build checks.

The 4 servers are provisioned using Ansible:
`https://git.typo3.org/typo3/CI/testing-infrastructure/-/tree/main/ansible?ref_type=heads`__ and
Pipelines configured in `https://github.com/TYPO3/typo3/tree/main/Build/gitlab-ci/`__.
Pipelines configured in `https://github.com/TYPO3/typo3/tree/main/Build/gitlab-ci/`__.

0 comments on commit 73386d3

Please sign in to comment.