Skip to content

Commit 8ac4929

Browse files
authored
Develop to Master (#1094)
1 parent 985588b commit 8ac4929

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+340
-1599
lines changed

.circleci/config.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,22 @@ shared: &shared
2525
name: Install the extension
2626
command: |
2727
cd ~/magento_directory
28+
sudo service elasticsearch start # for some reasons has to be launched with the step
29+
sleep 10
30+
php -dmemory_limit=-1 bin/magento module:disable Magento_WebapiAsync Magento_Amqp Magento_MysqlMq Magento_MessageQueue
2831
php -dmemory_limit=-1 bin/magento module:enable Algolia_AlgoliaSearch
2932
php -dmemory_limit=-1 bin/magento setup:upgrade
3033
3134
- run:
3235
name: Get the right tests config for DB and administration
3336
command: |
37+
rm -rf ~/magento_directory/vendor/dotmailer/dotmailer-magento2-extension/Test ~/magento_directory/vendor/dotmailer/dotmailer-magento2-extension-chat/Test
3438
mv ~/build_directory/algoliasearch-magento-2/dev/tests/install-config-mysql.php ~/magento_directory/dev/tests/integration/etc/install-config-mysql.php
3539
3640
- run:
3741
name: Before setup
3842
command: |
43+
echo 'memory_limit = 256M' | sudo tee /usr/local/etc/php/php.ini
3944
wget https://alg.li/algolia-keys && chmod +x algolia-keys
4045
4146
- run:
@@ -46,22 +51,24 @@ shared: &shared
4651
export CI_PROJ_USERNAME=$CIRCLE_PROJECT_USERNAME
4752
export CI_PROJ_REPONAME=$CIRCLE_PROJECT_REPONAME
4853
eval $(~/build_directory/algoliasearch-magento-2/algolia-keys export)
49-
php -dmemory_limit=-1 ../../../vendor/bin/phpunit ../../../vendor/algolia/algoliasearch-magento-2/Test
54+
sudo service elasticsearch start # for some reasons has to be launched with the step
55+
sleep 10
56+
php -dmemory_limit=-1 ../../../vendor/bin/phpunit --debug ../../../vendor/algolia/algoliasearch-magento-2/Test
5057
5158
jobs:
52-
"magento-2.2":
59+
"magento-2.3":
5360
<<: *shared
5461
docker:
55-
- image: algolia/magento2-circleci:v2-2.2.8
62+
- image: algolia/magento2-circleci:v3-2.3.5-p2
5663

57-
"magento-2.3":
64+
"magento-2.4":
5865
<<: *shared
5966
docker:
60-
- image: algolia/magento2-circleci:v2-2.3.0
67+
- image: algolia/magento2-circleci:v3-2.4.0
6168

6269
"quality-tools":
6370
docker:
64-
- image: algolia/magento2-circleci:v2-2.3.0
71+
- image: algolia/magento2-circleci:v3-2.3.5-p2
6572
working_directory: ~/build_directory/algoliasearch-magento-2
6673
steps:
6774
- checkout
@@ -71,8 +78,8 @@ jobs:
7178
sudo chown circleci:circleci ~/.composer/
7279
- restore_cache:
7380
keys:
74-
- composer-v3-{{ checksum "composer.json" }}
75-
- composer-v3-
81+
- composer-v4-{{ checksum "composer.json" }}
82+
- composer-v4-
7683

7784
- run:
7885
name: Prepare environment
@@ -89,7 +96,7 @@ jobs:
8996
cd ~/magento_directory
9097
composer dump-autoload
9198
- save_cache:
92-
key: composer-v3-{{ checksum "composer.json" }}
99+
key: composer-v4-{{ checksum "composer.json" }}
93100
paths:
94101
- vendor
95102
- run:
@@ -101,6 +108,6 @@ workflows:
101108
version: 2
102109
build:
103110
jobs:
104-
- "magento-2.2"
105111
- "magento-2.3"
112+
- "magento-2.4"
106113
- "quality-tools"

Adapter/Aggregation/Builder.php

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)