Skip to content

Commit 35b506d

Browse files
committed
prepare 1.0 release
1 parent 09811d0 commit 35b506d

File tree

5 files changed

+17
-22
lines changed

5 files changed

+17
-22
lines changed

.github/workflows/codeception.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Codeception
22
on:
33
push:
4-
branches: [ 'master' ]
4+
branches: [ '1.x' ]
55
pull_request:
6-
branches: [ 'master' ]
6+
branches: [ '1.x' ]
77

88
jobs:
99
codeception:
@@ -32,7 +32,7 @@ jobs:
3232
MYSQL_DATABASE: dachcom_bundle_test
3333
services:
3434
mysql:
35-
image: mysql:5.7
35+
image: mysql:8.0
3636
env:
3737
MYSQL_ROOT_PASSWORD: root
3838
MYSQL_DATABASE: dachcom_bundle_test
@@ -72,7 +72,7 @@ jobs:
7272
ls -al pimcore-codeception-framework
7373
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/setup.sh
7474
./pimcore-codeception-framework/src/_etc/scripts/setup.sh
75-
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "dev-master",g' composer.json
75+
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "1.x-dev",g' composer.json
7676
7777
- name: Install PHP
7878
uses: shivammathur/setup-php@v2
@@ -91,7 +91,7 @@ jobs:
9191
- name: Verify MySql Connection
9292
run: |
9393
sudo apt-get update
94-
sudo apt-get install -y mysql-client
94+
sudo apt-get install -y mysql-client-8.0
9595
mysql -uroot -h127.0.0.1 -proot -e "SHOW DATABASES"
9696
9797
- name: Setup MySql

.github/workflows/ecs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Easy Coding Standards
22
on:
33
push:
4-
branches: [ 'master' ]
4+
branches: [ '1.x' ]
55
pull_request:
6-
branches: [ 'master' ]
6+
branches: [ '1.x' ]
77

88
jobs:
99
ecs:
@@ -31,7 +31,7 @@ jobs:
3131
MYSQL_DATABASE: dachcom_bundle_test
3232
services:
3333
mysql:
34-
image: mysql:5.7
34+
image: mysql:8.0
3535
env:
3636
MYSQL_ROOT_PASSWORD: root
3737
MYSQL_DATABASE: dachcom_bundle_test
@@ -68,7 +68,7 @@ jobs:
6868
ls -al pimcore-codeception-framework
6969
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/setup.sh
7070
./pimcore-codeception-framework/src/_etc/scripts/setup.sh
71-
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "dev-master",g' composer.json
71+
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "1.x-dev",g' composer.json
7272
7373
- name: Install PHP
7474
uses: shivammathur/setup-php@v2
@@ -87,7 +87,7 @@ jobs:
8787
- name: Verify MySql Connection
8888
run: |
8989
sudo apt-get update
90-
sudo apt-get install -y mysql-client
90+
sudo apt-get install -y mysql-client-8.0
9191
mysql -uroot -h127.0.0.1 -proot -e "SHOW DATABASES"
9292
9393
- name: Setup MySql

.github/workflows/php-stan.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: PHP Stan
22
on:
33
push:
4-
branches: [ 'master' ]
4+
branches: [ '1.x' ]
55
pull_request:
6-
branches: [ 'master' ]
6+
branches: [ '1.x' ]
77

88
jobs:
99
stan:
@@ -31,7 +31,7 @@ jobs:
3131
MYSQL_DATABASE: dachcom_bundle_test
3232
services:
3333
mysql:
34-
image: mysql:5.7
34+
image: mysql:8.0
3535
env:
3636
MYSQL_ROOT_PASSWORD: root
3737
MYSQL_DATABASE: dachcom_bundle_test
@@ -67,7 +67,7 @@ jobs:
6767
ls -al pimcore-codeception-framework
6868
chmod +x ./pimcore-codeception-framework/src/_etc/scripts/setup.sh
6969
./pimcore-codeception-framework/src/_etc/scripts/setup.sh
70-
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "dev-master",g' composer.json
70+
sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "1.x-dev",g' composer.json
7171
7272
- name: Install PHP
7373
uses: shivammathur/setup-php@v2
@@ -86,7 +86,7 @@ jobs:
8686
- name: Verify MySql Connection
8787
run: |
8888
sudo apt-get update
89-
sudo apt-get install -y mysql-client
89+
sudo apt-get install -y mysql-client-8.0
9090
mysql -uroot -h127.0.0.1 -proot -e "SHOW DATABASES"
9191
9292
- name: Setup MySql

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A Index Storage Extension for [Pimcore Dynamic Search](https://github.com/dachco
1010
## Requirements
1111
- Pimcore >= 6.6
1212
- Symfony >= 4.4
13-
- Pimcore Dynamic Search
13+
- Pimcore Dynamic Search 1.0
1414

1515
***
1616

composer.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,10 @@
2626
"app/TestKernel.php"
2727
]
2828
},
29-
"extra": {
30-
"branch-alias": {
31-
"dev-master": "1.0-dev"
32-
}
33-
},
3429
"require": {
3530
"symfony/symfony": "^4|^5",
3631
"pimcore/pimcore": "^6.6",
37-
"dachcom-digital/dynamic-search": "^0.7",
32+
"dachcom-digital/dynamic-search": "^1.0",
3833
"elasticsearch/elasticsearch": "^7.0",
3934
"ongr/elasticsearch-dsl": "~7.1.0"
4035
},

0 commit comments

Comments
 (0)