Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,13 @@ jobs:
VERSION=$(jq -r '.extra | ."branch-alias" | ."dev-main"' < composer.json)
composer require --no-update "ibexa/solr:$VERSION"

- uses: ramsey/composer-install@v3
- name: Install Composer dependencies
uses: ibexa/gh-workflows/actions/composer-install@main
with:
dependency-versions: "highest"
gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}

- name: Run integration test suite
run: composer test-integration-solr
Expand Down
11 changes: 11 additions & 0 deletions dependencies.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"recipesEndpoint": "",
"packages": [
{
"requirement": "dev-IBX-11402-CountryTermAggregation-mapper-fix as 4.6.x-dev",
"repositoryUrl": "https://github.com/ibexa/solr",
"package": "ibexa/solr",
"shouldBeAddedAsVCS": false
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ protected function createFixturesForAggregation(Aggregation $aggregation): void
$generator->setFieldDefinitionIdentifier('country');
$generator->setFieldTypeIdentifier('ezcountry');
$generator->setValues([
['PL', 'US'],
['FR', 'US'],
['US'],
['PL', 'CA'],
['FR', 'CA'],
['CA'],
['GA', 'PL', 'FR'],
['FR', 'BE', 'US'],
['FR', 'BE', 'CA'],
]);

$generator->setFieldDefinitionCreateStructConfigurator(
Expand Down
Loading