Merge pull request #268 from BitBagCommerce/upgrade-to-20

Sylius 2.0 support

Author: senghe

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
       - 'dependabot/**'
   pull_request: ~
   release:
-    types: [ created ]
+    types: [created]
   schedule:
     - cron: "0 1 * * 6" # Run at 1am every Saturday
   workflow_dispatch: ~
@@ -20,11 +20,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "8.1", "8.2", "8.3" ]
-        symfony: [ "^5.4", "^6.0" ]
-        sylius: [ "~1.13.0", "~1.14.0" ]
-        node: [ "18.x", "20.x" ]
-        mysql: [ "5.7", "8.0" ]
+        php: [ "8.2", "8.3" ]
+        symfony: [ "^7.1" ]
+        sylius: [ "^2.0" ]
+        node: [ "20.x" ]
+        mysql: [ "8.0" ]
     env:
       APP_ENV: test
       DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"
@@ -76,7 +76,7 @@ jobs:
         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 &
 
       - name: Run webserver
-        run: (cd tests/Application && symfony server:start --port=8080 --dir=public --daemon)
+        run: (cd tests/Application && symfony server:start --port=8080 --dir=public --daemon && symfony -V)
 
       - name: Get Composer cache directory
         id: composer-cache
@@ -104,9 +104,6 @@ jobs:
       - name: Install PHP dependencies
         run: composer install --no-interaction --no-scripts
 
-      - name: Install Behat driver
-        run: vendor/bin/bdi browser:google-chrome drivers
-
       - name: Get Yarn cache directory
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -150,13 +147,11 @@ jobs:
       - name: Run PHPUnit
         run: vendor/bin/phpunit --colors=always
 
-      - name: Run Behat
-        if: ${{ matrix.sylius != '^1.13.0' }}
-        run: vendor/bin/behat --colors --strict -vvv --no-interaction  --tags '~@sylius113' || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun --tags '~@sylius113'
+      - name: Create behat logs directory
+        run: (mkdir -p etc/build && chmod a+rw etc/build )
 
       - name: Run Behat
-        if: ${{ matrix.sylius == '^1.13.0' }}
-        run: vendor/bin/behat --colors --strict -vvv --no-interaction --tags '~@sylius112' || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun --tags '~@sylius112'
+        run: vendor/bin/behat --colors --strict -vvv --no-interaction || vendor/bin/behat --colors --strict -vvv --no-interaction --rerun
 
       - name: Upload Behat logs
         uses: actions/upload-artifact@v4
@@ -165,6 +160,7 @@ jobs:
           name: Behat logs
           path: etc/build/
           if-no-files-found: ignore
+          overwrite: true
 
       - name: Run PHPUnit
         run: vendor/bin/phpunit --colors=always

.github/workflows/coding_standard.yml

@@ -18,10 +18,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ "8.1", "8.2", "8.3" ]
-        symfony: [ "^5.4", "^6.4" ]
-        sylius: [ "^1.12", "^1.13", "^1.14" ]
-        node: [ "18.x", "20.x" ]
+        php: [ "8.2", "8.3" ]
+        symfony: [ "^7.1" ]
+        sylius: [ "^2.0" ]
+        node: [ "20.x" ]
 
     steps:
       - uses: actions/checkout@v3

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 ARG DEBIAN_FRONTEND=noninteractive
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.2
 ENV LC_ALL=C.UTF-8
 
 # Install basic tools
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \
 # Append NODE, NGINX and PHP repositories
 RUN add-apt-repository ppa:ondrej/php \
     && add-apt-repository ppa:ondrej/nginx \
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash -
+    && curl -sL https://deb.nodesource.com/setup_20.x | bash -
 
 # Install required PHP extensions
 RUN apt-get update && apt-get install -y \

src/Resources/assets/admin/entry.js renamed to assets/admin/entry.js

@@ -1,2 +1,2 @@
 import './scss/main.scss'
-import './js/'
+import './js'

src/Resources/assets/admin/js/index.js renamed to assets/admin/js/index.js

@@ -1,2 +1,2 @@
 import './scss/main.scss'
-import './js/'
+import './js'