diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1c52fb9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +# Exclude files from releases/tarballs +tests/ export-ignore +.github/ export-ignore +.gitattributes export-ignore \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 54604ea..fbafbde 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,6 +1,8 @@ name: tests on: pull_request: + paths-ignore: + - "**.md" push: branches: [ main ] diff --git a/README.md b/README.md index 0c6cf6a..1b6ba4e 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ ## What is the difference between this and ddev-solr -Please consider using [ddev/ddev-solr](https://github.com/ddev/ddev-solr), which runs Solr in the modern "Cloud" mode. This offers several advantages. If you are using Drupal, the biggest advantage +Please consider using [ddev/ddev-solr](https://github.com/ddev/ddev-solr), which runs Solr in the modern "Cloud" mode. This is the recommended and maintained Apache Solr integration. `ddev-solr` offers several advantages. If you are using Drupal, the biggest advantage is that you can update the Solr Configset from the UI or with a Drush command everytime you update `search_api_solr`. -The current addon runs in "classic standalone" mode. It is probably simpler at first to setup, but comes with the added maintainance steps for configsets. Most Solr hosting service providers run "Solr Cloud" as a backend. +The current addon runs in "classic standalone" mode. It is probably simpler at first to setup, but comes with the added maintenance steps for configsets. Most Solr hosting service providers run "Solr Cloud" as a backend. ## Overview diff --git a/tests/test.bats b/tests/test.bats index d3026a2..1a58267 100644 --- a/tests/test.bats +++ b/tests/test.bats @@ -32,26 +32,33 @@ setup() { export DDEV_NO_INSTRUMENTATION=true ddev delete -Oy "${PROJNAME}" >/dev/null 2>&1 || true cd "${TESTDIR}" - run ddev config --project-name="${PROJNAME}" --project-tld=ddev.site --project-type=drupal9 --docroot=web --php-version=8.1 + run ddev config --project-name="${PROJNAME}" --project-tld=ddev.site --project-type=drupal11 --docroot=web assert_success run ddev start -y assert_success echo "# Setting up Drupal project via composer ${PROJNAME} in $(pwd)" >&3 - ddev composer create-project -n --no-install drupal/recommended-project:^9 >/dev/null - ddev composer require -n --no-install drush/drush:* drupal/search_api_solr >/dev/null - ddev composer config --append -- allow-plugins true - ddev composer install >/dev/null - ddev import-db --file=${DIR}/tests/testdata/db.sql.gz >/dev/null + run ddev composer create-project -n --no-install drupal/recommended-project >/dev/null + assert_success + run ddev composer require -n --no-install drush/drush:* drupal/search_api_solr >/dev/null + assert_success + run ddev composer config --append -- allow-plugins true + assert_success + run ddev composer install >/dev/null + assert_success + run ddev import-db --file=${DIR}/tests/testdata/db.sql.gz >/dev/null + assert_success + run ddev drush en -y search_api_solr + assert_success } health_checks() { - run ddev exec 'drush sapi-sl --format=json | jq -r .default_solr_server.status' + run ddev exec 'drush search-api:server-list --format=json | jq -r .ddev_solr_server.status' assert_success assert_output "enabled" - run ddev drush search-api-solr:reload default_solr_server - assert_success +# run ddev drush search-api-solr:reload ddev_solr_server +# assert_success # Make sure the solr admin UI via HTTP from outside is redirected to HTTP /solr/ run curl -sfI http://${PROJNAME}.ddev.site:8983 diff --git a/tests/testdata/db.sql.gz b/tests/testdata/db.sql.gz index 8f0edc2..94e8f9e 100644 Binary files a/tests/testdata/db.sql.gz and b/tests/testdata/db.sql.gz differ