Skip to content

Commit 8b80aad

Browse files
authored
Merge pull request #269 from BitBagCommerce/feature/Sylius-2_0_upgrade_build
2.0-Upgrade Build Fixes
2 parents 7894209 + 0564e43 commit 8b80aad

File tree

110 files changed

+482
-868
lines changed

Some content is hidden

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

110 files changed

+482
-868
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'dependabot/**'
77
pull_request: ~
88
release:
9-
types: [ created ]
9+
types: [created]
1010
schedule:
1111
- cron: "0 1 * * 6" # Run at 1am every Saturday
1212
workflow_dispatch: ~
@@ -20,11 +20,11 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
php: [ "8.1", "8.2", "8.3" ]
24-
symfony: [ "^5.4", "^6.0" ]
25-
sylius: [ "~1.13.0" ]
26-
node: [ "18.x", "20.x" ]
27-
mysql: [ "5.7", "8.0" ]
23+
php: [ "8.2", "8.3" ]
24+
symfony: [ "^7.1" ]
25+
sylius: [ "^2.0" ]
26+
node: [ "20.x" ]
27+
mysql: [ "8.0" ]
2828
env:
2929
APP_ENV: test
3030
DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"
@@ -76,7 +76,7 @@ jobs:
7676
run: google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' http://127.0.0.1 > /dev/null 2>&1 &
7777

7878
- name: Run webserver
79-
run: (cd tests/Application && symfony server:start --port=8080 --dir=public --daemon)
79+
run: (cd tests/Application && symfony server:start --port=8080 --dir=public --daemon && symfony -V)
8080

8181
- name: Get Composer cache directory
8282
id: composer-cache
@@ -104,9 +104,6 @@ jobs:
104104
- name: Install PHP dependencies
105105
run: composer install --no-interaction --no-scripts
106106

107-
- name: Install Behat driver
108-
run: vendor/bin/bdi browser:google-chrome drivers
109-
110107
- name: Get Yarn cache directory
111108
id: yarn-cache
112109
run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -150,21 +147,20 @@ jobs:
150147
- name: Run PHPUnit
151148
run: vendor/bin/phpunit --colors=always
152149

153-
- name: Run Behat
154-
if: ${{ matrix.sylius != '^1.13.0' }}
155-
run: vendor/bin/behat --colors --strict -vvv --no-interaction --tags '~@sylius113' || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun --tags '~@sylius113'
150+
- name: Create behat logs directory
151+
run: (mkdir -p etc/build && chmod a+rw etc/build )
156152

157153
- name: Run Behat
158-
if: ${{ matrix.sylius == '^1.13.0' }}
159-
run: vendor/bin/behat --colors --strict -vvv --no-interaction --tags '~@sylius112' || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun --tags '~@sylius112'
154+
run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
160155

161156
- name: Upload Behat logs
162-
uses: actions/upload-artifact@v3
157+
uses: actions/upload-artifact@v4
163158
if: failure()
164159
with:
165160
name: Behat logs
166161
path: etc/build/
167162
if-no-files-found: ignore
163+
overwrite: true
168164

169165
- name: Run PHPUnit
170166
run: vendor/bin/phpunit --colors=always
@@ -179,4 +175,4 @@ jobs:
179175
SLACK_MESSAGE: ':x:'
180176
SLACK_TITLE: Failed build on ${{ github.event.repository.name }} repository
181177
SLACK_USERNAME: ${{ secrets.FAILED_BUILD_SLACK_USERNAME }}
182-
SLACK_WEBHOOK: ${{ secrets.FAILED_BUILD_SLACK_WEBHOOK }}
178+
SLACK_WEBHOOK: ${{ secrets.FAILED_BUILD_SLACK_WEBHOOK }}

.github/workflows/coding_standard.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
php: [ "8.1", "8.2", "8.3" ]
22-
symfony: [ "^5.4", "^6.4" ]
23-
sylius: [ "^1.12", "^1.13" ]
24-
node: [ "18.x", "20.x" ]
21+
php: [ "8.2", "8.3" ]
22+
symfony: [ "^7.1" ]
23+
sylius: [ "^2.0" ]
24+
node: [ "20.x" ]
2525

2626
steps:
2727
- uses: actions/checkout@v3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
import './scss/main.scss'
2-
import './js/'
2+
import './js'
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
import './scss/main.scss'
2-
import './js/'
2+
import './js'
File renamed without changes.

src/Resources/assets/shop/js/elasticSearchCheckboxChangeSubmit.js renamed to assets/shop/js/elasticSearchCheckboxChangeSubmit.js

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)