Skip to content

Commit

Permalink
[TASK] Prepare release-11.6.x for TYPO3 11.5 LTS
Browse files Browse the repository at this point in the history
  • Loading branch information
dkd-kaehm committed Sep 15, 2023
1 parent 770f1e6 commit 0ec17bb
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ If applicable, add screenshots to help explain your problem.
**Used versions (please complete the following information):**
- TYPO3 Version: [e.g. 11.5.26]
- Browser: [e.g. chrome, safari]
- EXT:solr Version: [e.g. 11.5.3]
- Used Apache Solr Version: [e.g. 8.11.1]
- EXT:solr Version: [e.g. 11.6.0]
- Used Apache Solr Version: [e.g. 9.3.1]
- PHP Version: [e.g. 8.1.0]
- MySQL Version: [e.g. 8.0.0]

Expand Down
37 changes: 21 additions & 16 deletions .github/workflows/ci-matrix.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
{
"main": {
"PHP": [ "7.4", "8.0", "8.1" ],
"TYPO3": [ "11", "11.5.x-dev" ]
},
"main": {
"PHP": [ "8.1", "8.2", "8.3" ],
"TYPO3": [ "12", "12.4.x-dev" ]
},

"release-11.5.x": {
"PHP": [ "7.4", "8.0", "8.1" ],
"TYPO3": [ "11", "11.5.x-dev" ]
},
"release-12.0.x": {
"PHP": [ "8.1", "8.2" ],
"TYPO3": [ "12", "12.4.x-dev" ]
},

"release-11.1.x": {
"PHP": [ "7.2", "7.3", "7.4" ],
"TYPO3": [ "10", "10.4.x-dev" ]
},
"release-11.6.x": {
"PHP": [ "7.4", "8.0", "8.1", "8.2" ],
"TYPO3": [ "11", "11.5.x-dev" ]
},

"release-11.0.x": {
"PHP": [ "7.2", "7.3", "7.4" ],
"TYPO3": [ "9", "10", "9.5.x-dev", "10.4.x-dev" ]
}
"release-11.5.x": {
"PHP": [ "7.4", "8.0", "8.1", "8.2" ],
"TYPO3": [ "11", "11.5.x-dev" ]
},

"release-11.2.x": {
"PHP": [ "7.2", "7.3", "7.4" ],
"TYPO3": [ "10", "10.4.x-dev" ]
}
}
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: build

on:
push:
branches: [ main, release-11.5.x, release-11.1.x, release-11.0.x ]
branches: [ main, release-11.6.x, release-11.5.x ]
tags:
- "**"
pull_request:
branches: [ main, release-11.5.x, release-11.1.x, release-11.0.x ]
branches: [ main, release-11.6.x, release-11.5.x ]

env:
CI_BUILD_DIRECTORY: '/home/runner/work/ext-solr/ext-solr/.Build'
Expand Down Expand Up @@ -67,8 +67,6 @@ jobs:
echo -e "matrix : "
echo $matrix
echo ::set-output name=matrix::$(echo $matrix)
>&2 echo -e "Example Annotation on error. Is visible in Actions wokflow view."
>&2 echo -e "Non-stable releases can not be published to TER. The tag 11.5.0-beta-1 is invalid for TER."
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
Expand Down
4 changes: 2 additions & 2 deletions Documentation/Appendix/VersionMatrix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ List of EXT:solr versions and the matching versions of Apache Solr and TYPO3 tha
------------------------------- ---------------------------------------------- --------------------------------------------- ---------------------------------
TYPO3 EXT: solr EXT:tika EXT:solrfal EXT:solrconsole EXT:solrdebugtools EXT:solrfluidgrouping EXT:solrmlt Apache Solr Configset
========= ========== ========== =========== =============== ================== ============================= =============== =============== =================
12.4 12.0 (ᾱ) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 9.2.0 ext_solr_12_0_0
11.5 11.5 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 8.11.1 ext_solr_11_5_0
12.4 12.0 (ᾱ) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 9.3.0 ext_solr_12_0_0
11.5 11.6 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 9.3.0 ext_solr_11_5_0
========= ========== ========== =========== =============== ================== ============================= =============== =============== =================

Ø - not yet available
Expand Down
33 changes: 33 additions & 0 deletions Documentation/Releases/solr-release-11-6.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
.. include:: ../Includes.rst.txt


.. _releases-11-6:

==========================
Apache Solr for TYPO3 11.6
==========================

Apache Solr for TYPO3 11.6.0
============================

TBD

How to Get Involved
===================

There are many ways to get involved with Apache Solr for TYPO3:

* Submit bug reports and feature requests on [GitHub](https://github.com/TYPO3-Solr/ext-solr)
* Ask or help or answer questions in our [Slack channel](https://typo3.slack.com/messages/ext-solr/)
* Provide patches through Pull Request or review and comment on existing [Pull Requests](https://github.com/TYPO3-Solr/ext-solr/pulls)
* Go to [www.typo3-solr.com](http://www.typo3-solr.com) or call [dkd](http://www.dkd.de) to sponsor the ongoing development of Apache Solr for TYPO3

Support us by becoming an EB partner:

https://shop.dkd.de/Produkte/Apache-Solr-fuer-TYPO3/

or call:

+49 (0)69 - 2475218 0


4 changes: 2 additions & 2 deletions Documentation/Settings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
[general]

project = Apache Solr for TYPO3
version = 11.5
release = 11.5.3
version = 11.6
release = 11.6.0
copyright = since 2009 by dkd & contributors

[html_theme_options]
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
[![TYPO3 11](https://img.shields.io/badge/TYPO3-11-orange.svg?style=flat-square)](https://get.typo3.org/version/11)
[![Total Downloads](http://poser.pugx.org/apache-solr-for-typo3/solr/downloads)](https://packagist.org/packages/apache-solr-for-typo3/solr)
[![Monthly Downloads](https://poser.pugx.org/apache-solr-for-typo3/solr/d/monthly)](https://packagist.org/packages/apache-solr-for-typo3/solr)
[![Build Status](https://github.com/TYPO3-Solr/ext-solr/actions/workflows/ci.yml/badge.svg?branch=release-11.5.x)](https://github.com/TYPO3-Solr/ext-solr/actions?query=branch:release-11.5.x)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/quality-score.png?b=release-11.5.x)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=release-11.5.x)
[![Code Coverage](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/coverage.png?b=release-11.5.x)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=release-11.5.x)
[![Build Status](https://github.com/TYPO3-Solr/ext-solr/actions/workflows/ci.yml/badge.svg?branch=release-11.6.x)](https://github.com/TYPO3-Solr/ext-solr/actions?query=branch:release-11.6.x)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/quality-score.png?b=release-11.6.x)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=release-11.6.x)
[![Code Coverage](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/coverage.png?b=release-11.6.x)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=release-11.6.x)

# Apache Solr for TYPO3 CMS

Expand All @@ -28,7 +28,7 @@ Further details including a comparison chart are provided at the program homepag
| | URL |
|------------------|-----------------------------------------------------------------|
| **Repository:** | https://github.com/TYPO3-Solr/ext-solr |
| **Read online:** | https://docs.typo3.org/p/apache-solr-for-typo3/solr/11.5/en-us/ |
| **Read online:** | https://docs.typo3.org/p/apache-solr-for-typo3/solr/11.6/en-us/ |
| **TER:** | https://extensions.typo3.org/extension/solr |
| **Homepage:** | https://www.typo3-solr.com/ |

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
},
"extra": {
"branch-alias": {
"dev-release-11.5.x": "11.5.x-dev"
"dev-release-11.6.x": "11.6.x-dev"
},
"typo3/cms": {
"extension-key": "solr",
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$EM_CONF[$_EXTKEY] = [
'title' => 'Apache Solr for TYPO3 - Enterprise Search',
'description' => 'Apache Solr for TYPO3 is the enterprise search server you were looking for with special features such as Faceted Search or Synonym Support and incredibly fast response times of results within milliseconds.',
'version' => '11.5.3',
'version' => '11.6.0',
'state' => 'stable',
'category' => 'plugin',
'author' => 'Ingo Renner, Timo Hund, Markus Friedrich',
Expand Down

0 comments on commit 0ec17bb

Please sign in to comment.