mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-05 20:57:12 +00:00
Merge branch '2.3' into feature/support-webpack-encore-6.0.0
This commit is contained in:
commit
216c80d251
12 changed files with 26 additions and 379 deletions
6
.github/PULL_REQUEST_TEMPLATE.md
vendored
6
.github/PULL_REQUEST_TEMPLATE.md
vendored
|
|
@ -1,6 +1,6 @@
|
||||||
| Q | A
|
| Q | A
|
||||||
|-----------------|-----
|
|-----------------|-----
|
||||||
| Branch? | 1.14, 2.0 or 2.1 <!-- see the comment below -->
|
| Branch? | 2.2 or 2.3 <!-- see the comment below -->
|
||||||
| Bug fix? | no/yes
|
| Bug fix? | no/yes
|
||||||
| New feature? | no/yes
|
| New feature? | no/yes
|
||||||
| BC breaks? | no/yes
|
| BC breaks? | no/yes
|
||||||
|
|
@ -9,8 +9,8 @@
|
||||||
| License | MIT
|
| License | MIT
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
- Bug fixes must be submitted against the 1.14 or 2.1 branch
|
- Bug fixes must be submitted against the 2.2 branch
|
||||||
- Features and deprecations must be submitted against the 2.2 branch
|
- Features and deprecations must be submitted against the 2.3 branch
|
||||||
- Make sure that the correct base branch is set
|
- Make sure that the correct base branch is set
|
||||||
|
|
||||||
To be sure you are not breaking any Backward Compatibilities, check the documentation:
|
To be sure you are not breaking any Backward Compatibilities, check the documentation:
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
name: Continuous Integration 2.2 (Full)
|
name: Continuous Integration (Full)
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
|
@ -10,17 +10,17 @@ on:
|
||||||
workflow_dispatch: ~
|
workflow_dispatch: ~
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ci-${{ github.workflow }}-${{ github.ref }}-2_0-full
|
group: ci-${{ github.workflow }}-${{ github.ref }}-full
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
static-checks:
|
static-checks:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
branch: ["2.2"]
|
branch: ["2.2", "2.3"]
|
||||||
name: "[${{ matrix.branch }}] Static checks"
|
name: "[${{ matrix.branch }}] Static checks"
|
||||||
uses: ./.github/workflows/ci_static-checks.yaml
|
uses: ./.github/workflows/ci_static-checks.yaml
|
||||||
with:
|
with:
|
||||||
|
|
@ -29,7 +29,7 @@ jobs:
|
||||||
e2e-mariadb:
|
e2e-mariadb:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
branch: ["2.2"]
|
branch: ["2.2", "2.3"]
|
||||||
name: "[${{ matrix.branch }}] Tests (MariaDB)"
|
name: "[${{ matrix.branch }}] Tests (MariaDB)"
|
||||||
needs: static-checks
|
needs: static-checks
|
||||||
uses: ./.github/workflows/ci_e2e-mariadb.yaml
|
uses: ./.github/workflows/ci_e2e-mariadb.yaml
|
||||||
|
|
@ -39,7 +39,7 @@ jobs:
|
||||||
e2e-mysql:
|
e2e-mysql:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
branch: ["2.2"]
|
branch: ["2.2", "2.3"]
|
||||||
name: "[${{ matrix.branch }}] Tests (MySQL)"
|
name: "[${{ matrix.branch }}] Tests (MySQL)"
|
||||||
needs: static-checks
|
needs: static-checks
|
||||||
uses: ./.github/workflows/ci_e2e-mysql.yaml
|
uses: ./.github/workflows/ci_e2e-mysql.yaml
|
||||||
|
|
@ -49,7 +49,7 @@ jobs:
|
||||||
e2e-pgsql:
|
e2e-pgsql:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
branch: ["2.2"]
|
branch: ["2.2", "2.3"]
|
||||||
name: "[${{ matrix.branch }}] Tests (PostgreSQL)"
|
name: "[${{ matrix.branch }}] Tests (PostgreSQL)"
|
||||||
needs: static-checks
|
needs: static-checks
|
||||||
uses: ./.github/workflows/ci_e2e-pgsql.yaml
|
uses: ./.github/workflows/ci_e2e-pgsql.yaml
|
||||||
|
|
@ -59,7 +59,7 @@ jobs:
|
||||||
e2e-js:
|
e2e-js:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
branch: ["2.2"]
|
branch: ["2.2", "2.3"]
|
||||||
name: "[${{ matrix.branch }}] Javascript Tests (MySQL)"
|
name: "[${{ matrix.branch }}] Javascript Tests (MySQL)"
|
||||||
needs: static-checks
|
needs: static-checks
|
||||||
uses: ./.github/workflows/ci_js.yaml
|
uses: ./.github/workflows/ci_js.yaml
|
||||||
|
|
@ -67,7 +67,10 @@ jobs:
|
||||||
branch: ${{ matrix.branch }}
|
branch: ${{ matrix.branch }}
|
||||||
type: full
|
type: full
|
||||||
frontend:
|
frontend:
|
||||||
name: Frontend
|
strategy:
|
||||||
|
matrix:
|
||||||
|
branch: ["2.2", "2.3"]
|
||||||
|
name: "[${{ matrix.branch }}] Frontend"
|
||||||
needs: static-checks
|
needs: static-checks
|
||||||
uses: ./.github/workflows/ci_frontend.yaml
|
uses: ./.github/workflows/ci_frontend.yaml
|
||||||
with:
|
with:
|
||||||
|
|
@ -76,7 +79,7 @@ jobs:
|
||||||
packages:
|
packages:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
branch: ["2.2"]
|
branch: ["2.2", "2.3"]
|
||||||
name: "[${{ matrix.branch }}] Packages"
|
name: "[${{ matrix.branch }}] Packages"
|
||||||
needs: static-checks
|
needs: static-checks
|
||||||
uses: ./.github/workflows/ci_packages.yaml
|
uses: ./.github/workflows/ci_packages.yaml
|
||||||
118
.github/workflows/ci__full_1_14.yaml
vendored
118
.github/workflows/ci__full_1_14.yaml
vendored
|
|
@ -1,118 +0,0 @@
|
||||||
name: Continuous Integration 1.14 (Full)
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'full-ci/**'
|
|
||||||
schedule:
|
|
||||||
-
|
|
||||||
cron: "0 1 * * *" # Run every day at 1am
|
|
||||||
workflow_dispatch: ~
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ci-${{ github.workflow }}-${{ github.ref }}-1_14-full
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
static-checks:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["1.14"]
|
|
||||||
name: "[${{ matrix.branch }}] Static checks"
|
|
||||||
uses: ./.github/workflows/ci_static-checks.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
e2e-mariadb:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["1.14"]
|
|
||||||
name: "[${{ matrix.branch }}] End-to-end tests (MariaDB)"
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_e2e-mariadb.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
e2e-mysql:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["1.14"]
|
|
||||||
name: "[${{ matrix.branch }}] End-to-end tests (MySQL)"
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_e2e-mysql.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
e2e-pgsql:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["1.14"]
|
|
||||||
name: "[${{ matrix.branch }}] End-to-end tests (PostgreSQL)"
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_e2e-pgsql.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
frontend:
|
|
||||||
name: Frontend
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_frontend.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
packages:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["1.14"]
|
|
||||||
name: "[${{ matrix.branch }}] Packages"
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_packages.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
notify-about-build-status:
|
|
||||||
if: ${{ always() }}
|
|
||||||
name: "Notify about build status"
|
|
||||||
needs: [static-checks, e2e-mariadb, e2e-mysql, e2e-pgsql, frontend, packages]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 20
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: "Process data"
|
|
||||||
id: process-data
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo "branch=$(echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/refs\/tags\///g')" >> $GITHUB_OUTPUT
|
|
||||||
echo "sha=$(echo ${{ github.sha }} | cut -c 1-12)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: "Notify on Slack"
|
|
||||||
uses: edge/simple-slack-notify@master
|
|
||||||
env:
|
|
||||||
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
|
|
||||||
if: env.SLACK_WEBHOOK_URL != null
|
|
||||||
with:
|
|
||||||
channel: "#daily-build"
|
|
||||||
username: "GitHub Actions"
|
|
||||||
text: |
|
|
||||||
*<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} | ${{ github.workflow }} #${{ github.run_number }} build on ${{ github.repository }} repository has been completed for ${{ steps.process-data.outputs.branch }} branch.>*
|
|
||||||
|
|
||||||
${{ needs.static-checks.result == 'success' && ':+1:' || ':x:' }} Static Checks
|
|
||||||
${{ needs.e2e-mariadb.result == 'success' && ':+1:' || ':x:' }} End-to-End (MariaDB)
|
|
||||||
${{ needs.e2e-mysql.result == 'success' && ':+1:' || ':x:' }} End-to-End (MySQL)
|
|
||||||
${{ needs.e2e-pgsql.result == 'success' && ':+1:' || ':x:' }} End-to-End (PostgreSQL)
|
|
||||||
${{ needs.frontend.result == 'success' && ':+1:' || ':x:' }} Frontend
|
|
||||||
${{ needs.packages.result == 'success' && ':+1:' || ':x:' }} Packages
|
|
||||||
|
|
||||||
_ _ _ _ _ _ _
|
|
||||||
color: "danger"
|
|
||||||
fields: |
|
|
||||||
[
|
|
||||||
{ "title": "Repository", "value": "<https://github.com/${{ github.repository }} | ${{ github.repository }}>", "short": true },
|
|
||||||
{ "title": "Action", "value": "<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} | ${{ github.workflow }} #${{ github.run_number }}>", "short": true },
|
|
||||||
{ "title": "Reference", "value": "<https://github.com/${{ github.repository }}/tree/${{ steps.process-data.outputs.branch }} | ${{ steps.process-data.outputs.branch }}>", "short": true },
|
|
||||||
{ "title": "Commit", "value": "<https://github.com/${{ github.repository }}/commit/${{ github.sha }} | ${{ steps.process-data.outputs.sha }}>", "short": true },
|
|
||||||
{ "title": "Event", "value": "${{ github.event_name }}", "short": true }
|
|
||||||
]
|
|
||||||
129
.github/workflows/ci__full_2_1.yaml
vendored
129
.github/workflows/ci__full_2_1.yaml
vendored
|
|
@ -1,129 +0,0 @@
|
||||||
name: Continuous Integration 2.1 (Full)
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- 'full-ci/**'
|
|
||||||
schedule:
|
|
||||||
-
|
|
||||||
cron: "0 2 * * *" # Run every day at 2am
|
|
||||||
workflow_dispatch: ~
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ci-${{ github.workflow }}-${{ github.ref }}-2_1-full
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
static-checks:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["2.1"]
|
|
||||||
name: "[${{ matrix.branch }}] Static checks"
|
|
||||||
uses: ./.github/workflows/ci_static-checks.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
e2e-mariadb:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["2.1"]
|
|
||||||
name: "[${{ matrix.branch }}] Tests (MariaDB)"
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_e2e-mariadb.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
e2e-mysql:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["2.1"]
|
|
||||||
name: "[${{ matrix.branch }}] Tests (MySQL)"
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_e2e-mysql.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
e2e-pgsql:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["2.1"]
|
|
||||||
name: "[${{ matrix.branch }}] Tests (PostgreSQL)"
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_e2e-pgsql.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
e2e-js:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["2.1"]
|
|
||||||
name: "[${{ matrix.branch }}] Javascript Tests (MySQL)"
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_js.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
frontend:
|
|
||||||
name: Frontend
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_frontend.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
packages:
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
branch: ["2.1"]
|
|
||||||
name: "[${{ matrix.branch }}] Packages"
|
|
||||||
needs: static-checks
|
|
||||||
uses: ./.github/workflows/ci_packages.yaml
|
|
||||||
with:
|
|
||||||
branch: ${{ matrix.branch }}
|
|
||||||
type: full
|
|
||||||
notify-about-build-status:
|
|
||||||
if: ${{ always() }}
|
|
||||||
name: "Notify about build status"
|
|
||||||
needs: [static-checks, e2e-mariadb, e2e-mysql, e2e-pgsql, e2e-js, frontend, packages]
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 20
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: "Process data"
|
|
||||||
id: process-data
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
echo "branch=$(echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/refs\/tags\///g')" >> $GITHUB_OUTPUT
|
|
||||||
echo "sha=$(echo ${{ github.sha }} | cut -c 1-12)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: "Notify on Slack"
|
|
||||||
uses: edge/simple-slack-notify@master
|
|
||||||
env:
|
|
||||||
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
|
|
||||||
if: env.SLACK_WEBHOOK_URL != null
|
|
||||||
with:
|
|
||||||
channel: "#daily-build"
|
|
||||||
username: "GitHub Actions"
|
|
||||||
text: |
|
|
||||||
*<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} | ${{ github.workflow }} #${{ github.run_number }} build on ${{ github.repository }} repository has been completed for ${{ steps.process-data.outputs.branch }} branch.>*
|
|
||||||
|
|
||||||
${{ needs.static-checks.result == 'success' && ':+1:' || ':x:' }} Static Checks
|
|
||||||
${{ needs.e2e-mariadb.result == 'success' && ':+1:' || ':x:' }} Tests (MariaDB)
|
|
||||||
${{ needs.e2e-mysql.result == 'success' && ':+1:' || ':x:' }} Tests (MySQL)
|
|
||||||
${{ needs.e2e-pgsql.result == 'success' && ':+1:' || ':x:' }} Tests (PostgreSQL)
|
|
||||||
${{ needs.e2e-js.result == 'success' && ':+1:' || ':x:' }} Javascript Tests (MySQL)
|
|
||||||
${{ needs.frontend.result == 'success' && ':+1:' || ':x:' }} Frontend
|
|
||||||
${{ needs.packages.result == 'success' && ':+1:' || ':x:' }} Packages
|
|
||||||
|
|
||||||
_ _ _ _ _ _ _
|
|
||||||
color: "danger"
|
|
||||||
fields: |
|
|
||||||
[
|
|
||||||
{ "title": "Repository", "value": "<https://github.com/${{ github.repository }} | ${{ github.repository }}>", "short": true },
|
|
||||||
{ "title": "Action", "value": "<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} | ${{ github.workflow }} #${{ github.run_number }}>", "short": true },
|
|
||||||
{ "title": "Reference", "value": "<https://github.com/${{ github.repository }}/tree/${{ steps.process-data.outputs.branch }} | ${{ steps.process-data.outputs.branch }}>", "short": true },
|
|
||||||
{ "title": "Commit", "value": "<https://github.com/${{ github.repository }}/commit/${{ github.sha }} | ${{ steps.process-data.outputs.sha }}>", "short": true },
|
|
||||||
{ "title": "Event", "value": "${{ github.event_name }}", "short": true }
|
|
||||||
]
|
|
||||||
28
.github/workflows/ci_e2e-mariadb.yaml
vendored
28
.github/workflows/ci_e2e-mariadb.yaml
vendored
|
|
@ -57,17 +57,6 @@ jobs:
|
||||||
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BRANCH: ${{ inputs.branch }}
|
|
||||||
run: |
|
|
||||||
if [ "$BRANCH" == "1.14" ]; then
|
|
||||||
echo "NODE_VERSION=20.x" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "NODE_VERSION=24.x" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: "Checkout (With Branch)"
|
- name: "Checkout (With Branch)"
|
||||||
if: "${{ inputs.branch != '' }}"
|
if: "${{ inputs.branch != '' }}"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -85,7 +74,6 @@ jobs:
|
||||||
composer require winzou/state-machine-bundle:^0.6 --no-update
|
composer require winzou/state-machine-bundle:^0.6 --no-update
|
||||||
|
|
||||||
- name: Prepare manifest.json files
|
- name: Prepare manifest.json files
|
||||||
if: "${{ inputs.branch != '1.14' }}"
|
|
||||||
run: |
|
run: |
|
||||||
mkdir -p public/build/admin
|
mkdir -p public/build/admin
|
||||||
mkdir -p public/build/shop
|
mkdir -p public/build/shop
|
||||||
|
|
@ -125,7 +113,7 @@ jobs:
|
||||||
database: "mariadb:${{ matrix.mariadb }}"
|
database: "mariadb:${{ matrix.mariadb }}"
|
||||||
php_version: ${{ matrix.php }}
|
php_version: ${{ matrix.php }}
|
||||||
symfony_version: ${{ matrix.symfony }}
|
symfony_version: ${{ matrix.symfony }}
|
||||||
node_version: ${{ env.NODE_VERSION }}
|
node_version: "24.x"
|
||||||
chrome_version: stable
|
chrome_version: stable
|
||||||
|
|
||||||
- name: Run PHPUnit
|
- name: Run PHPUnit
|
||||||
|
|
@ -170,17 +158,6 @@ jobs:
|
||||||
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BRANCH: ${{ inputs.branch }}
|
|
||||||
run: |
|
|
||||||
if [ "$BRANCH" == "1.14" ]; then
|
|
||||||
echo "NODE_VERSION=20.x" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "NODE_VERSION=24.x" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: "Checkout (With Branch)"
|
- name: "Checkout (With Branch)"
|
||||||
if: "${{ inputs.branch != '' }}"
|
if: "${{ inputs.branch != '' }}"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -198,7 +175,6 @@ jobs:
|
||||||
composer require winzou/state-machine-bundle:^0.6 --no-update
|
composer require winzou/state-machine-bundle:^0.6 --no-update
|
||||||
|
|
||||||
- name: Prepare manifest.json files
|
- name: Prepare manifest.json files
|
||||||
if: "${{ inputs.branch != '1.14' }}"
|
|
||||||
run: |
|
run: |
|
||||||
mkdir -p public/build/admin
|
mkdir -p public/build/admin
|
||||||
mkdir -p public/build/shop
|
mkdir -p public/build/shop
|
||||||
|
|
@ -238,7 +214,7 @@ jobs:
|
||||||
database: "mariadb:${{ matrix.mariadb }}"
|
database: "mariadb:${{ matrix.mariadb }}"
|
||||||
php_version: ${{ matrix.php }}
|
php_version: ${{ matrix.php }}
|
||||||
symfony_version: ${{ matrix.symfony }}
|
symfony_version: ${{ matrix.symfony }}
|
||||||
node_version: ${{ env.NODE_VERSION }}
|
node_version: "24.x"
|
||||||
chrome_version: stable
|
chrome_version: stable
|
||||||
|
|
||||||
- name: Run UI Behat
|
- name: Run UI Behat
|
||||||
|
|
|
||||||
28
.github/workflows/ci_e2e-mysql.yaml
vendored
28
.github/workflows/ci_e2e-mysql.yaml
vendored
|
|
@ -56,17 +56,6 @@ jobs:
|
||||||
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BRANCH: ${{ inputs.branch }}
|
|
||||||
run: |
|
|
||||||
if [ "$BRANCH" == "1.14" ]; then
|
|
||||||
echo "NODE_VERSION=20.x" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "NODE_VERSION=24.x" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: "Checkout (With Branch)"
|
- name: "Checkout (With Branch)"
|
||||||
if: "${{ inputs.branch != '' }}"
|
if: "${{ inputs.branch != '' }}"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -82,7 +71,6 @@ jobs:
|
||||||
run: composer require --no-update --no-scripts --no-interaction "twig/twig:${{ matrix.twig }}"
|
run: composer require --no-update --no-scripts --no-interaction "twig/twig:${{ matrix.twig }}"
|
||||||
|
|
||||||
- name: Prepare manifest.json files
|
- name: Prepare manifest.json files
|
||||||
if: "${{ inputs.branch != '1.14' }}"
|
|
||||||
run: |
|
run: |
|
||||||
mkdir -p public/build/admin
|
mkdir -p public/build/admin
|
||||||
mkdir -p public/build/shop
|
mkdir -p public/build/shop
|
||||||
|
|
@ -103,7 +91,7 @@ jobs:
|
||||||
database: "mysql:${{ matrix.mysql }}"
|
database: "mysql:${{ matrix.mysql }}"
|
||||||
php_version: ${{ matrix.php }}
|
php_version: ${{ matrix.php }}
|
||||||
symfony_version: ${{ matrix.symfony }}
|
symfony_version: ${{ matrix.symfony }}
|
||||||
node_version: ${{ env.NODE_VERSION }}
|
node_version: "24.x"
|
||||||
|
|
||||||
- name: Fix permissions for Symfony logs directory
|
- name: Fix permissions for Symfony logs directory
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -155,17 +143,6 @@ jobs:
|
||||||
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BRANCH: ${{ inputs.branch }}
|
|
||||||
run: |
|
|
||||||
if [ "$BRANCH" == "1.14" ]; then
|
|
||||||
echo "NODE_VERSION=20.x" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "NODE_VERSION=24.x" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: "Checkout (With Branch)"
|
- name: "Checkout (With Branch)"
|
||||||
if: "${{ inputs.branch != '' }}"
|
if: "${{ inputs.branch != '' }}"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -181,7 +158,6 @@ jobs:
|
||||||
run: composer require --no-update --no-scripts --no-interaction "twig/twig:${{ matrix.twig }}"
|
run: composer require --no-update --no-scripts --no-interaction "twig/twig:${{ matrix.twig }}"
|
||||||
|
|
||||||
- name: Prepare manifest.json files
|
- name: Prepare manifest.json files
|
||||||
if: "${{ inputs.branch != '1.14' }}"
|
|
||||||
run: |
|
run: |
|
||||||
mkdir -p public/build/admin
|
mkdir -p public/build/admin
|
||||||
mkdir -p public/build/shop
|
mkdir -p public/build/shop
|
||||||
|
|
@ -202,7 +178,7 @@ jobs:
|
||||||
database: "mysql:${{ matrix.mysql }}"
|
database: "mysql:${{ matrix.mysql }}"
|
||||||
php_version: ${{ matrix.php }}
|
php_version: ${{ matrix.php }}
|
||||||
symfony_version: ${{ matrix.symfony }}
|
symfony_version: ${{ matrix.symfony }}
|
||||||
node_version: ${{ env.NODE_VERSION }}
|
node_version: "24.x"
|
||||||
|
|
||||||
- name: Run UI Behat
|
- name: Run UI Behat
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
28
.github/workflows/ci_e2e-pgsql.yaml
vendored
28
.github/workflows/ci_e2e-pgsql.yaml
vendored
|
|
@ -56,17 +56,6 @@ jobs:
|
||||||
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BRANCH: ${{ inputs.branch }}
|
|
||||||
run: |
|
|
||||||
if [ "$BRANCH" == "1.14" ]; then
|
|
||||||
echo "NODE_VERSION=20.x" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "NODE_VERSION=24.x" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: "Checkout (With Branch)"
|
- name: "Checkout (With Branch)"
|
||||||
if: "${{ inputs.branch != '' }}"
|
if: "${{ inputs.branch != '' }}"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -78,7 +67,6 @@ jobs:
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Prepare manifest.json files
|
- name: Prepare manifest.json files
|
||||||
if: "${{ inputs.branch != '1.14' }}"
|
|
||||||
run: |
|
run: |
|
||||||
mkdir -p public/build/admin
|
mkdir -p public/build/admin
|
||||||
mkdir -p public/build/shop
|
mkdir -p public/build/shop
|
||||||
|
|
@ -99,7 +87,7 @@ jobs:
|
||||||
database: "postgres:${{ matrix.postgres }}"
|
database: "postgres:${{ matrix.postgres }}"
|
||||||
php_version: ${{ matrix.php }}
|
php_version: ${{ matrix.php }}
|
||||||
symfony_version: ${{ matrix.symfony }}
|
symfony_version: ${{ matrix.symfony }}
|
||||||
node_version: ${{ env.NODE_VERSION }}
|
node_version: "24.x"
|
||||||
chrome_version: stable
|
chrome_version: stable
|
||||||
|
|
||||||
- name: Run PHPUnit
|
- name: Run PHPUnit
|
||||||
|
|
@ -143,17 +131,6 @@ jobs:
|
||||||
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BRANCH: ${{ inputs.branch }}
|
|
||||||
run: |
|
|
||||||
if [ "$BRANCH" == "1.14" ]; then
|
|
||||||
echo "NODE_VERSION=20.x" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "NODE_VERSION=24.x" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: "Checkout (With Branch)"
|
- name: "Checkout (With Branch)"
|
||||||
if: "${{ inputs.branch != '' }}"
|
if: "${{ inputs.branch != '' }}"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -165,7 +142,6 @@ jobs:
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Prepare manifest.json files
|
- name: Prepare manifest.json files
|
||||||
if: "${{ inputs.branch != '1.14' }}"
|
|
||||||
run: |
|
run: |
|
||||||
mkdir -p public/build/admin
|
mkdir -p public/build/admin
|
||||||
mkdir -p public/build/shop
|
mkdir -p public/build/shop
|
||||||
|
|
@ -186,7 +162,7 @@ jobs:
|
||||||
database: "postgres:${{ matrix.postgres }}"
|
database: "postgres:${{ matrix.postgres }}"
|
||||||
php_version: ${{ matrix.php }}
|
php_version: ${{ matrix.php }}
|
||||||
symfony_version: ${{ matrix.symfony }}
|
symfony_version: ${{ matrix.symfony }}
|
||||||
node_version: ${{ env.NODE_VERSION }}
|
node_version: "24.x"
|
||||||
chrome_version: stable
|
chrome_version: stable
|
||||||
|
|
||||||
- name: Run UI Behat
|
- name: Run UI Behat
|
||||||
|
|
|
||||||
11
.github/workflows/ci_frontend.yaml
vendored
11
.github/workflows/ci_frontend.yaml
vendored
|
|
@ -50,17 +50,6 @@ jobs:
|
||||||
APP_ENV: test_cached
|
APP_ENV: test_cached
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BRANCH: ${{ inputs.branch }}
|
|
||||||
run: |
|
|
||||||
if [ "$BRANCH" == "1.12" ]; then
|
|
||||||
echo "USE_LEGACY_POSTGRES_SETUP=yes" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "USE_LEGACY_POSTGRES_SETUP=no" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: "Checkout (With Branch)"
|
- name: "Checkout (With Branch)"
|
||||||
if: "${{ inputs.branch != '' }}"
|
if: "${{ inputs.branch != '' }}"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
|
||||||
26
.github/workflows/ci_js.yaml
vendored
26
.github/workflows/ci_js.yaml
vendored
|
|
@ -64,17 +64,6 @@ jobs:
|
||||||
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BRANCH: ${{ inputs.branch }}
|
|
||||||
run: |
|
|
||||||
if [ "$BRANCH" == "1.14" ]; then
|
|
||||||
echo "NODE_VERSION=20.x" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "NODE_VERSION=24.x" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: "Checkout (With Branch)"
|
- name: "Checkout (With Branch)"
|
||||||
if: "${{ inputs.branch != '' }}"
|
if: "${{ inputs.branch != '' }}"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -111,7 +100,7 @@ jobs:
|
||||||
database: "mysql:${{ matrix.mysql }}"
|
database: "mysql:${{ matrix.mysql }}"
|
||||||
php_version: ${{ matrix.php }}
|
php_version: ${{ matrix.php }}
|
||||||
symfony_version: ${{ matrix.symfony }}
|
symfony_version: ${{ matrix.symfony }}
|
||||||
node_version: ${{ env.NODE_VERSION }}
|
node_version: "24.x"
|
||||||
|
|
||||||
- name: Run Behat (${{ matrix.group }})
|
- name: Run Behat (${{ matrix.group }})
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -145,17 +134,6 @@ jobs:
|
||||||
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
BEHAT_RERUN_CMD: "vendor/bin/behat --colors --strict --no-interaction -vvv -f pretty --rerun"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
|
||||||
shell: bash
|
|
||||||
env:
|
|
||||||
BRANCH: ${{ inputs.branch }}
|
|
||||||
run: |
|
|
||||||
if [ "$BRANCH" == "1.14" ]; then
|
|
||||||
echo "NODE_VERSION=20.x" >> $GITHUB_ENV
|
|
||||||
else
|
|
||||||
echo "NODE_VERSION=24.x" >> $GITHUB_ENV
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: "Checkout (With Branch)"
|
- name: "Checkout (With Branch)"
|
||||||
if: "${{ inputs.branch != '' }}"
|
if: "${{ inputs.branch != '' }}"
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
@ -192,7 +170,7 @@ jobs:
|
||||||
database: "mysql:${{ matrix.mysql }}"
|
database: "mysql:${{ matrix.mysql }}"
|
||||||
php_version: ${{ matrix.php }}
|
php_version: ${{ matrix.php }}
|
||||||
symfony_version: ${{ matrix.symfony }}
|
symfony_version: ${{ matrix.symfony }}
|
||||||
node_version: ${{ env.NODE_VERSION }}
|
node_version: "24.x"
|
||||||
chrome_version: stable
|
chrome_version: stable
|
||||||
|
|
||||||
- name: Run Behat (Panther)
|
- name: Run Behat (Panther)
|
||||||
|
|
|
||||||
4
.github/workflows/ci_static-checks.yaml
vendored
4
.github/workflows/ci_static-checks.yaml
vendored
|
|
@ -122,10 +122,6 @@ jobs:
|
||||||
- name: Run PHPStan
|
- name: Run PHPStan
|
||||||
run: vendor/bin/phpstan analyse
|
run: vendor/bin/phpstan analyse
|
||||||
|
|
||||||
- name: Run PHPSpec
|
|
||||||
if: ${{ inputs.branch == '1.14' }}
|
|
||||||
run: vendor/bin/phpspec run --ansi --no-interaction -f dot
|
|
||||||
|
|
||||||
- name: Run ComposerRequireChecker
|
- name: Run ComposerRequireChecker
|
||||||
run: |
|
run: |
|
||||||
(cat composer.json | jq '.["autoload-dev"]["psr-4"] |= . + {"Sylius\\Behat\\": "src/Sylius/Behat/"}' | jq 'del(.autoload["psr-4"]["Sylius\\Behat\\"])') > _composer.json
|
(cat composer.json | jq '.["autoload-dev"]["psr-4"] |= . + {"Sylius\\Behat\\": "src/Sylius/Behat/"}' | jq 'del(.autoload["psr-4"]["Sylius\\Behat\\"])') > _composer.json
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@
|
||||||
"ramsey/uuid": "^4.7",
|
"ramsey/uuid": "^4.7",
|
||||||
"stof/doctrine-extensions-bundle": "^1.12",
|
"stof/doctrine-extensions-bundle": "^1.12",
|
||||||
"sylius-labs/association-hydrator": "^1.2",
|
"sylius-labs/association-hydrator": "^1.2",
|
||||||
"sylius-labs/doctrine-migrations-extra-bundle": "^0.3",
|
"sylius-labs/doctrine-migrations-extra-bundle": "^0.2 || ^0.3",
|
||||||
"sylius/fixtures-bundle": "^1.9",
|
"sylius/fixtures-bundle": "^1.9",
|
||||||
"sylius/grid": "^1.13",
|
"sylius/grid": "^1.13",
|
||||||
"sylius/grid-bundle": "^1.13",
|
"sylius/grid-bundle": "^1.13",
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
"league/flysystem-bundle": "^3.3",
|
"league/flysystem-bundle": "^3.3",
|
||||||
"liip/imagine-bundle": "^2.15",
|
"liip/imagine-bundle": "^2.15",
|
||||||
"sylius-labs/association-hydrator": "^1.2",
|
"sylius-labs/association-hydrator": "^1.2",
|
||||||
"sylius-labs/doctrine-migrations-extra-bundle": "^0.3",
|
"sylius-labs/doctrine-migrations-extra-bundle": "^0.2 || ^0.3",
|
||||||
"sylius/addressing-bundle": "^2.0",
|
"sylius/addressing-bundle": "^2.0",
|
||||||
"sylius/attribute-bundle": "^2.0",
|
"sylius/attribute-bundle": "^2.0",
|
||||||
"sylius/channel-bundle": "^2.0",
|
"sylius/channel-bundle": "^2.0",
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue