Skip to content

Commit 7c3dede

Browse files
authored
Merge pull request #15 from maximehuran/feature/sylius-1-11
Add Sylius 1.11 compatibility
2 parents 2162e5e + 653a0c7 commit 7c3dede

File tree

5 files changed

+26
-18
lines changed

5 files changed

+26
-18
lines changed

.github/workflows/recipe.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
push:
55
branches: [ master ]
66
pull_request:
7+
schedule:
8+
- cron: '0 0 * * 1'
79

810
jobs:
911

@@ -18,12 +20,14 @@ jobs:
1820
fail-fast: false
1921
matrix:
2022
php: ['7.4' ,'8.0']
21-
sylius: ["~1.8.0", "~1.9.0", "~1.10.0"]
23+
sylius: ["~1.8.0", "~1.9.0", "~1.10.0", "~1.11.0"]
2224
exclude:
2325
- php: 8.0
2426
sylius: "~1.8.0"
2527
- php: 8.0
2628
sylius: "~1.9.0"
29+
- php: 7.4
30+
sylius: "~1.11.0"
2731

2832
steps:
2933
- name: Setup PHP
@@ -53,9 +57,6 @@ jobs:
5357
key: composer2-php:${{ matrix.php }}-sylius:${{ matrix.sylius }}-${{ github.sha }}
5458
restore-keys: composer2-php:${{ matrix.php }}-sylius:${{ matrix.sylius }}-
5559

56-
- name: Composer v2
57-
run: sudo composer self-update --2
58-
5960
- name: Composer Github Auth
6061
run: composer config -g github-oauth.github.com ${{ github.token }}
6162

@@ -72,6 +73,7 @@ jobs:
7273
- name: Setup some requirements
7374
working-directory: ./sylius
7475
run: |
76+
composer config --no-plugins allow-plugins true
7577
composer config repositories.plugin '{"type": "path", "url": "../plugin/"}'
7678
composer config extra.symfony.allow-contrib true
7779
composer config secure-http false

.github/workflows/security.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Security
33
on:
44
push:
55
pull_request:
6+
schedule:
7+
- cron: '0 0 * * 1'
68

79
jobs:
810

@@ -32,10 +34,6 @@ jobs:
3234
restore-keys: composer2-php:${{ matrix.php }}-
3335

3436
- run: mkdir -p /home/runner/{.composer/cache,.config/composer}
35-
if: steps.cache-composer.outputs.cache-hit != 'true'
36-
37-
- name: Composer v2
38-
run: sudo composer self-update --2
3937

4038
- name: Composer Github Auth
4139
run: composer config -g github-oauth.github.com ${{ github.token }}
@@ -45,4 +43,4 @@ jobs:
4543
- name: Install PHP dependencies
4644
run: composer update --prefer-dist
4745

48-
- uses: symfonycorp/security-checker-action@v2
46+
- uses: symfonycorp/security-checker-action@v3

.github/workflows/tests.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
push:
55
branches: [ master ]
66
pull_request:
7+
schedule:
8+
- cron: '0 0 * * 1'
79

810
jobs:
911

@@ -14,7 +16,7 @@ jobs:
1416
strategy:
1517
fail-fast: false
1618
matrix:
17-
php: ['7.4', '8.0']
19+
php: ['8.0']
1820

1921
env:
2022
SYMFONY_ARGS: --no-tls
@@ -35,8 +37,8 @@ jobs:
3537
3638
- name: Install symfony CLI
3739
run: |
38-
curl https://get.symfony.com/cli/installer | bash
39-
echo "${HOME}/.symfony/bin" >> $GITHUB_PATH
40+
curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | sudo -E bash
41+
sudo apt install symfony-cli
4042
4143
- uses: actions/cache@v1
4244
id: cache-composer
@@ -46,10 +48,6 @@ jobs:
4648
restore-keys: composer2-php:${{ matrix.php }}-
4749

4850
- run: mkdir -p /home/runner/{.composer/cache,.config/composer}
49-
if: steps.cache-composer.outputs.cache-hit != 'true'
50-
51-
- name: Composer v2
52-
run: sudo composer self-update --2
5351

5452
- name: Composer Github Auth
5553
run: composer config -g github-oauth.github.com ${{ github.token }}

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.DEFAULT_GOAL := help
22
SHELL=/bin/bash
33
APP_DIR=tests/Application
4-
SYLIUS_VERSION=1.10.0
4+
SYLIUS_VERSION=1.11.0
55
SYMFONY=cd ${APP_DIR} && symfony
66
COMPOSER=symfony composer
77
CONSOLE=${SYMFONY} console
@@ -69,6 +69,7 @@ setup_application:
6969
(cd ${APP_DIR} && ${COMPOSER} config repositories.plugin '{"type": "path", "url": "../../"}')
7070
(cd ${APP_DIR} && ${COMPOSER} config extra.symfony.allow-contrib true)
7171
(cd ${APP_DIR} && ${COMPOSER} config minimum-stability dev)
72+
(cd ${APP_DIR} && ${COMPOSER} config --no-plugins allow-plugins true)
7273
(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
7374
$(MAKE) ${APP_DIR}/.php-version
7475
$(MAKE) ${APP_DIR}/php.ini

composer.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "MIT",
77
"require": {
88
"php": "~7.4|~8.0",
9-
"sylius/sylius": ">=1.8 <1.11"
9+
"sylius/sylius": ">=1.8 <1.12"
1010
},
1111
"require-dev": {
1212
"behat/behat": "^3.6.1",
@@ -67,5 +67,14 @@
6767
"branch-alias": {
6868
"dev-master": "1.0-dev"
6969
}
70+
},
71+
"config": {
72+
"allow-plugins": {
73+
"dealerdirect/phpcodesniffer-composer-installer": true,
74+
"symfony/thanks": true,
75+
"phpstan/extension-installer": true,
76+
"ergebnis/composer-normalize": true,
77+
"symfony/flex": true
78+
}
7079
}
7180
}

0 commit comments

Comments
 (0)