diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml index 6c6332e..6e1bd63 100644 --- a/.github/workflows/codeception.yml +++ b/.github/workflows/codeception.yml @@ -1,9 +1,9 @@ name: Codeception on: push: - branches: [ 'master' ] + branches: [ '1.x' ] pull_request: - branches: [ 'master' ] + branches: [ '1.x' ] jobs: codeception: @@ -32,7 +32,7 @@ jobs: MYSQL_DATABASE: dachcom_bundle_test services: mysql: - image: mysql:5.7 + image: mysql:8.0 env: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: dachcom_bundle_test @@ -72,7 +72,7 @@ jobs: ls -al pimcore-codeception-framework chmod +x ./pimcore-codeception-framework/src/_etc/scripts/setup.sh ./pimcore-codeception-framework/src/_etc/scripts/setup.sh - sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "dev-master",g' composer.json + sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "1.x-dev",g' composer.json - name: Install PHP uses: shivammathur/setup-php@v2 @@ -91,7 +91,7 @@ jobs: - name: Verify MySql Connection run: | sudo apt-get update - sudo apt-get install -y mysql-client + sudo apt-get install -y mysql-client-8.0 mysql -uroot -h127.0.0.1 -proot -e "SHOW DATABASES" - name: Setup MySql diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml index e82a84e..f93afdc 100644 --- a/.github/workflows/ecs.yml +++ b/.github/workflows/ecs.yml @@ -1,9 +1,9 @@ name: Easy Coding Standards on: push: - branches: [ 'master' ] + branches: [ '1.x' ] pull_request: - branches: [ 'master' ] + branches: [ '1.x' ] jobs: ecs: @@ -31,7 +31,7 @@ jobs: MYSQL_DATABASE: dachcom_bundle_test services: mysql: - image: mysql:5.7 + image: mysql:8.0 env: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: dachcom_bundle_test @@ -68,7 +68,7 @@ jobs: ls -al pimcore-codeception-framework chmod +x ./pimcore-codeception-framework/src/_etc/scripts/setup.sh ./pimcore-codeception-framework/src/_etc/scripts/setup.sh - sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "dev-master",g' composer.json + sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "1.x-dev",g' composer.json - name: Install PHP uses: shivammathur/setup-php@v2 @@ -87,7 +87,7 @@ jobs: - name: Verify MySql Connection run: | sudo apt-get update - sudo apt-get install -y mysql-client + sudo apt-get install -y mysql-client-8.0 mysql -uroot -h127.0.0.1 -proot -e "SHOW DATABASES" - name: Setup MySql diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml index 484adad..e62eb06 100644 --- a/.github/workflows/php-stan.yml +++ b/.github/workflows/php-stan.yml @@ -1,9 +1,9 @@ name: PHP Stan on: push: - branches: [ 'master' ] + branches: [ '1.x' ] pull_request: - branches: [ 'master' ] + branches: [ '1.x' ] jobs: stan: @@ -31,7 +31,7 @@ jobs: MYSQL_DATABASE: dachcom_bundle_test services: mysql: - image: mysql:5.7 + image: mysql:8.0 env: MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: dachcom_bundle_test @@ -67,7 +67,7 @@ jobs: ls -al pimcore-codeception-framework chmod +x ./pimcore-codeception-framework/src/_etc/scripts/setup.sh ./pimcore-codeception-framework/src/_etc/scripts/setup.sh - sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "dev-master",g' composer.json + sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "1.x-dev",g' composer.json - name: Install PHP uses: shivammathur/setup-php@v2 @@ -86,7 +86,7 @@ jobs: - name: Verify MySql Connection run: | sudo apt-get update - sudo apt-get install -y mysql-client + sudo apt-get install -y mysql-client-8.0 mysql -uroot -h127.0.0.1 -proot -e "SHOW DATABASES" - name: Setup MySql diff --git a/README.md b/README.md index 4a84a4b..c098c1f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ A Index Storage Extension for [Pimcore Dynamic Search](https://github.com/dachco ## Requirements - Pimcore >= 6.6 - Symfony >= 4.4 -- Pimcore Dynamic Search +- Pimcore Dynamic Search 1.0 *** diff --git a/composer.json b/composer.json index 618a2d8..30735f5 100644 --- a/composer.json +++ b/composer.json @@ -26,15 +26,10 @@ "app/TestKernel.php" ] }, - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "require": { "symfony/symfony": "^4|^5", "pimcore/pimcore": "^6.6", - "dachcom-digital/dynamic-search": "^0.7", + "dachcom-digital/dynamic-search": "^1.0", "elasticsearch/elasticsearch": "^7.0", "ongr/elasticsearch-dsl": "~7.1.0" },