Skip to content

[TASK] Switch to pure TYPO3 Site-Sets for EXT:solr 13.1.x+ #66

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.

Sign up for GitHub

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

Merged
dkd-kaehm merged 1 commit into from
Dec 9, 2025
Merged

[TASK] Switch to pure TYPO3 Site-Sets for EXT:solr 13.1.x+ #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .ddev/commands/host/enable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ if [[ ! -d "packages/introduction_""$EXT_NAME" ]]; then
fi

if [[ -d "$LOCAL_EXT_SOLR_PLUGIN_PATH" ]]; then
LOCAL_EXT_SOLR_PLUGIN="apache-solr-for-typo3/$EXT_NAME:@dev"
LOCAL_EXT_SOLR_PLUGIN="apache-solr-for-typo3/$EXT_NAME"
echo ""
echo "Installing $LOCAL_EXT_SOLR_PLUGIN from $LOCAL_EXT_SOLR_PLUGIN_PATH local path,"
echo " since composer does not allow to require @dev local libraries recursively."
echo " since composer does not allow to require * local libraries recursively."
echo "Please don't push the composer.json and composer.lock with activated EXT:Solr plugins in solr-ddev-site repository."
elif [[ "$EXT_NAME" != "news" ]]; then
echo "The $LOCAL_EXT_SOLR_PLUGIN_PATH does not exist."
Expand All @@ -36,8 +36,8 @@ elif [[ "$EXT_NAME" != "news" ]]; then
fi

# shellcheck disable=SC2086
if ! ddev composer req "apache-solr-for-typo3/introduction-$EXT_NAME:@dev" $LOCAL_EXT_SOLR_PLUGIN ; then
EXECUTED_COMMAND="composer req \"apache-solr-for-typo3/introduction-$EXT_NAME:@dev\" $LOCAL_EXT_SOLR_PLUGIN"
if ! ddev composer req "apache-solr-for-typo3/introduction-$EXT_NAME" $LOCAL_EXT_SOLR_PLUGIN ; then
EXECUTED_COMMAND="composer req \"apache-solr-for-typo3/introduction-$EXT_NAME\" $LOCAL_EXT_SOLR_PLUGIN"
echo "Something went wrong by following composer command:"
echo " "$EXECUTED_COMMAND
echo "please check the output from above."
Expand Down
3 changes: 3 additions & 0 deletions .ddev/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ hooks:
env --unset=_ --unset=TERM --unset=LS_COLORS | grep -v -e '=$' ;
echo '* * * * * TYPO3_CONTEXT=Development /usr/bin/php /var/www/html/vendor/bin/typo3 scheduler:run';
} | crontab -
# temporary delete all sys_template records to avoid manual steps after that commit.
- exec:
echo 'DELETE FROM sys_template WHERE 1=1;' | typo3 database:import

webimage_extra_packages: [cron, jq, openjdk-17-jre-headless, parallel]
use_dns_when_possible: true
Expand Down
6 changes: 3 additions & 3 deletions .ddev/docker-compose.solr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ services:
- HTTP_EXPOSE=8985
- HTTPS_EXPOSE=8985
web:
links:
- solr-tests:$DDEV_HOSTNAME
- solr-site:$DDEV_HOSTNAME
depends_on:
- solr-tests
- solr-site

volumes:
solr-site:
Expand Down
32 changes: 16 additions & 16 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@
"options": {
"reference": "none",
"versions": {
"apache-solr-for-typo3/introduction-news": "13.0",
"apache-solr-for-typo3/introduction-solrconsole": "13.0",
"apache-solr-for-typo3/introduction-solrdebugtools": "13.0",
"apache-solr-for-typo3/introduction-solrfal": "13.0",
"apache-solr-for-typo3/introduction-news": "13.1",
"apache-solr-for-typo3/introduction-solrconsole": "13.1",
"apache-solr-for-typo3/introduction-solrdebugtools": "13.1",
"apache-solr-for-typo3/introduction-solrfal": "13.1",

"apache-solr-for-typo3/php-solr-explain": "4.0.0",
"apache-solr-for-typo3/solr": "13.0",
"apache-solr-for-typo3/solrconsole": "13.0",
"apache-solr-for-typo3/solrdebugtools": "13.0",
"apache-solr-for-typo3/solrfal": "13.0",
"apache-solr-for-typo3/solrfheadless": "13.0",
"apache-solr-for-typo3/solrmlt": "13.0",
"apache-solr-for-typo3/tika": "13.0",
"apache-solr-for-typo3/php-solr-explain": "4.0.99",
"apache-solr-for-typo3/solr": "13.1.99",
"apache-solr-for-typo3/solrconsole": "13.1.99",
"apache-solr-for-typo3/solrdebugtools": "13.1.99",
"apache-solr-for-typo3/solrfal": "13.1.99",
"apache-solr-for-typo3/solrfheadless": "13.1.99",
"apache-solr-for-typo3/solrmlt": "13.1.99",
"apache-solr-for-typo3/tika": "13.1.99",

"dkd/apache-solr-for-typo3-sitepackage": "13.0"
"dkd/apache-solr-for-typo3-sitepackage": "13.1"
}
}
}
Expand All @@ -46,9 +46,9 @@
"ext-libxml": "*",
"ext-pdo": "*",
"ext-simplexml": "*",
"apache-solr-for-typo3/solr": "13.0",
"bk2k/bootstrap-package": "^15.0.0",
"dkd/apache-solr-for-typo3-sitepackage": "13.0",
"apache-solr-for-typo3/solr": "^13.1",
"bk2k/bootstrap-package": "^16.0.0",
"dkd/apache-solr-for-typo3-sitepackage": "^13.1",
"helhum/typo3-console": "~8.2.2",
"typo3/cms-core": "^13.4"
},
Expand Down
Loading