From 70a238a59aadf9b5892bd3ddd9c5a36f8076a94a Mon Sep 17 00:00:00 2001 From: Markus Kalkbrenner Date: Fri, 21 Feb 2025 19:03:26 +0100 Subject: [PATCH] remove old limited drupal 11 tests since all other contrib modules are available now --- .github/workflows/jump-start-config-sets.yml | 128 +------------------ 1 file changed, 7 insertions(+), 121 deletions(-) diff --git a/.github/workflows/jump-start-config-sets.yml b/.github/workflows/jump-start-config-sets.yml index abefb302..a4d64210 100644 --- a/.github/workflows/jump-start-config-sets.yml +++ b/.github/workflows/jump-start-config-sets.yml @@ -163,17 +163,17 @@ jobs: strategy: matrix: - drupal: ['10.4'] + drupal: ['10.4', '11.1'] solr: ['4', '5', '6', '7', '8', '9'] - php: ['8.2', '8.3', '8.4'] + php: ['8.3', '8.4'] solarium: ['solarium/solarium:"dev-master as 6.3.99"'] experimental: [false] include: - - drupal: '11.1' - solr: '9' - php: '8.3' + - drupal: '10.4' + solr: '8' + php: '8.2' solarium: 'solarium/solarium' - experimental: true + experimental: false name: Drupal ${{ matrix.drupal }}, Solr ${{ matrix.solr }}, PHP ${{ matrix.php }} @@ -268,125 +268,11 @@ jobs: php -S localhost:8888 >& /dev/null & vendor/bin/drush si standard --db-url=sqlite://sites/default/files/db.sqlite --yes vendor/bin/drush en search_api_solr_admin,search_api_solr_devel,search_api_solr_legacy,search_api_solr_log,search_api_spellcheck,search_api_solr_autocomplete,facets,search_api_location --yes - vendor/bin/phpunit -v -c core --group search_api_solr --exclude-group not_drupal${{ matrix.drupal }},not_solr${{ matrix.solr }} modules/contrib/search_api_solr + vendor/bin/phpunit -c core --group search_api_solr --exclude-group not_drupal${{ matrix.drupal }},not_solr${{ matrix.solr }} modules/contrib/search_api_solr vendor/bin/drush cim --partial --source=modules/contrib/search_api_solr/jump-start/drupal_configs --yes vendor/bin/drush -v solr-gsc solr_cloud test-config-generation.zip vendor/bin/drush -v cron - run-d11-tests: - runs-on: ubuntu-24.04 - - needs: generate-config-sets - - continue-on-error: ${{ matrix.experimental }} - - strategy: - matrix: - drupal: ['11.1'] - solr: ['4', '5', '6', '7', '8', '9'] - php: ['8.3', '8.4'] - solarium: ['solarium/solarium:"dev-master as 6.3.99"'] - experimental: [true] - - name: Drupal ${{ matrix.drupal }}, Solr ${{ matrix.solr }}, PHP ${{ matrix.php }}, less contrib - - env: - COMPOSER_MEMORY_LIMIT: -1 - - steps: - - name: Setup sqlite - run: | - sudo apt-get update - sudo apt-get install sqlite3 libsqlite3-dev - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, intl, gd, iconv, json, simplexml - ini-values: memory_limit=256M,post_max_size=256M - coverage: none - - - uses: actions/download-artifact@v4 - with: - name: jump-start-config-sets - path: solr - - - name: Start Solr ${{ matrix.solr }} - run: | - cd solr/solr${{ matrix.solr }} - cat docker-compose.yml - docker compose up -d - - - name: Checkout drupal - uses: actions/checkout@v4 - with: - repository: drupal/drupal - ref: ${{ matrix.drupal }}.x - path: drupal - - - name: Checkout search_api_solr - uses: actions/checkout@v4 - with: - path: search_api_solr - fetch-depth: 0 - - - name: Tag search_api_solr - run: | - cd search_api_solr - git tag ${{ env.NEXT_MODULE_VERSION }} - - - name: Install dependencies - run: | - cd drupal - php -v - composer config platform.php ${{ matrix.php }}.0 - composer config repositories.search_api_solr '{"type": "vcs", "url": "../search_api_solr"}' - composer install --no-interaction - composer require ${{ matrix.solarium }} drupal/search_api_solr:${{ env.NEXT_MODULE_VERSION }} --no-interaction - # search_api was installed as dependency above. This is a required check! Now switch to the latest dev version. - composer require drupal/search_api:1.x-dev --no-interaction - composer require \ - drupal/search_api_autocomplete:1.x-dev \ - drupal/search_api_spellcheck:4.0.x-dev \ - drupal/facets:3.0.x-dev \ - drupal/better_exposed_filters \ - drush/drush \ - monolog/monolog \ - --no-interaction - # cd modules/contrib/search_api - # wget https://www.drupal.org/files/issues/2022-11-04/3318187-19--fix_views_filter_regressions.patch - # patch -p1 < 3318187-19--fix_views_filter_regressions.patch - # cd - - - - name: Create Solr collections - run: | - docker ps - docker exec solr${{ matrix.solr }}-solr${{ matrix.solr }}-1 wait-for-solr.sh - docker exec solr${{ matrix.solr }}-solr${{ matrix.solr }}-1 bin/solr create -c techproducts -d server/solr/configsets/sample_techproducts_configs/conf -n sample_techproducts_configs - docker exec solr${{ matrix.solr }}-solr${{ matrix.solr }}-1 bash -c "bin/post -c techproducts example/exampledocs/*.xml" - docker exec solr${{ matrix.solr }}-solr${{ matrix.solr }}-1 bin/solr create -c checkpoints - - - name: Run tests - env: - SOLR_INDEX_WAIT: 4 - SOLR_CLOUD: true - SYMFONY_DEPRECATIONS_HELPER: disabled - run: | - cp search_api_solr/tests/github.phpunit.d11.xml drupal/core/phpunit.xml.dist - cd drupal - # Workaround until these modules are D11 compatible. - rm modules/contrib/search_api_solr/tests/src/Functional/FacetsTest.php - rm modules/contrib/search_api_solr/modules/search_api_solr_legacy/tests/src/Functional/FacetsTest.php - rm modules/contrib/search_api_solr/tests/src/Kernel/SearchApiSolrLocationTest.php - php -S localhost:8888 >& /dev/null & - vendor/bin/drush si standard --db-url=sqlite://sites/default/files/db.sqlite --yes - vendor/bin/drush en search_api_solr_admin,search_api_solr_legacy,search_api_spellcheck,search_api_solr_autocomplete --yes - vendor/bin/phpunit -c core --group search_api_solr --exclude-group not_drupal${{ matrix.drupal }},not_solr${{ matrix.solr }} modules/contrib/search_api_solr - vendor/bin/drush cim --partial --source=modules/contrib/search_api_solr/jump-start/drupal_configs --yes - vendor/bin/drush -v solr-gsc solr_cloud test-config-generation.zip - vendor/bin/drush -v cron - run-legacy-tests: runs-on: ubuntu-24.04