mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 17:10:53 +00:00
Merge branch '1.13' into 1.14
* 1.13: [CI] Extract unstable build from full builds [CI] Add SyliusMailerBundle alpha version to custom build [CI] Specify exact MariaDB versions [CI] Bump up DB versions to current LTS [CI] Upgrade ResourceBundle in unstable custom build
This commit is contained in:
commit
a86a5bc287
7 changed files with 57 additions and 73 deletions
9
.github/workflows/ci__full_1_13.yaml
vendored
9
.github/workflows/ci__full_1_13.yaml
vendored
|
|
@ -79,16 +79,10 @@ jobs:
|
|||
with:
|
||||
branch: ${{ matrix.branch }}
|
||||
type: full
|
||||
unstable:
|
||||
name: Unstable
|
||||
needs: static-checks
|
||||
uses: ./.github/workflows/ci__unstable.yaml
|
||||
with:
|
||||
ignore-failure: false
|
||||
notify-about-build-status:
|
||||
if: ${{ always() }}
|
||||
name: "Notify about build status"
|
||||
needs: [static-checks, e2e-mariadb, e2e-mysql, e2e-pgsql, e2e-custom, packages, unstable]
|
||||
needs: [static-checks, e2e-mariadb, e2e-mysql, e2e-pgsql, e2e-custom, packages]
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 5
|
||||
|
||||
|
|
@ -117,7 +111,6 @@ jobs:
|
|||
${{ needs.e2e-pgsql.result == 'success' && ':+1:' || ':x:' }} End-to-End (PostgreSQL)
|
||||
${{ needs.e2e-custom.result == 'success' && ':+1:' || ':x:' }} End-to-End (Custom)
|
||||
${{ needs.packages.result == 'success' && ':+1:' || ':x:' }} Packages
|
||||
${{ needs.unstable.result == 'success' && ':+1:' || ':x:' }} Unstable
|
||||
|
||||
_ _ _ _ _ _ _
|
||||
color: "danger"
|
||||
|
|
|
|||
9
.github/workflows/ci__full_1_14.yaml
vendored
9
.github/workflows/ci__full_1_14.yaml
vendored
|
|
@ -79,16 +79,10 @@ jobs:
|
|||
with:
|
||||
branch: ${{ matrix.branch }}
|
||||
type: full
|
||||
unstable:
|
||||
name: Unstable
|
||||
needs: static-checks
|
||||
uses: ./.github/workflows/ci__unstable.yaml
|
||||
with:
|
||||
ignore-failure: false
|
||||
notify-about-build-status:
|
||||
if: ${{ always() }}
|
||||
name: "Notify about build status"
|
||||
needs: [static-checks, e2e-mariadb, e2e-mysql, e2e-pgsql, e2e-custom, packages, unstable]
|
||||
needs: [static-checks, e2e-mariadb, e2e-mysql, e2e-pgsql, e2e-custom, packages]
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 5
|
||||
|
||||
|
|
@ -117,7 +111,6 @@ jobs:
|
|||
${{ needs.e2e-pgsql.result == 'success' && ':+1:' || ':x:' }} End-to-End (PostgreSQL)
|
||||
${{ needs.e2e-custom.result == 'success' && ':+1:' || ':x:' }} End-to-End (Custom)
|
||||
${{ needs.packages.result == 'success' && ':+1:' || ':x:' }} Packages
|
||||
${{ needs.unstable.result == 'success' && ':+1:' || ':x:' }} Unstable
|
||||
|
||||
_ _ _ _ _ _ _
|
||||
color: "danger"
|
||||
|
|
|
|||
9
.github/workflows/ci__full_2_0.yaml
vendored
9
.github/workflows/ci__full_2_0.yaml
vendored
|
|
@ -79,16 +79,10 @@ jobs:
|
|||
with:
|
||||
branch: ${{ matrix.branch }}
|
||||
type: full
|
||||
unstable:
|
||||
name: Unstable
|
||||
needs: static-checks
|
||||
uses: ./.github/workflows/ci__unstable.yaml
|
||||
with:
|
||||
ignore-failure: false
|
||||
notify-about-build-status:
|
||||
if: ${{ always() }}
|
||||
name: "Notify about build status"
|
||||
needs: [static-checks, e2e-mariadb, e2e-mysql, e2e-pgsql, e2e-custom, packages, unstable]
|
||||
needs: [static-checks, e2e-mariadb, e2e-mysql, e2e-pgsql, e2e-custom, packages]
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 5
|
||||
|
||||
|
|
@ -117,7 +111,6 @@ jobs:
|
|||
${{ needs.e2e-pgsql.result == 'success' && ':+1:' || ':x:' }} End-to-End (PostgreSQL)
|
||||
${{ needs.e2e-custom.result == 'success' && ':+1:' || ':x:' }} End-to-End (Custom)
|
||||
${{ needs.packages.result == 'success' && ':+1:' || ':x:' }} Packages
|
||||
${{ needs.unstable.result == 'success' && ':+1:' || ':x:' }} Unstable
|
||||
|
||||
_ _ _ _ _ _ _
|
||||
color: "danger"
|
||||
|
|
|
|||
20
.github/workflows/ci__unstable.yaml
vendored
20
.github/workflows/ci__unstable.yaml
vendored
|
|
@ -1,19 +1,10 @@
|
|||
name: Continuous Integration (Unstable)
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
ignore-failure:
|
||||
description: "Don't fail on error"
|
||||
required: false
|
||||
type: boolean
|
||||
default: false
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
ignore-failure:
|
||||
description: "Don't fail on error"
|
||||
type: boolean
|
||||
default: false
|
||||
schedule:
|
||||
-
|
||||
cron: "0 4 * * *" # Run every day at 4am
|
||||
workflow_dispatch: ~
|
||||
|
||||
concurrency:
|
||||
group: ci-${{ github.workflow }}-${{ github.ref }}-unstable
|
||||
|
|
@ -26,11 +17,8 @@ jobs:
|
|||
e2e-unstable:
|
||||
name: End-to-end tests (Unstable)
|
||||
uses: ./.github/workflows/ci_e2e-unstable.yaml
|
||||
with:
|
||||
ignore-failure: ${{ inputs.ignore-failure }}
|
||||
packages-unstable:
|
||||
name: Packages (Unstable)
|
||||
uses: ./.github/workflows/ci_packages-unstable.yaml
|
||||
with:
|
||||
type: minimal
|
||||
ignore-failure: ${{ inputs.ignore-failure }}
|
||||
|
|
|
|||
17
.github/workflows/ci_e2e-custom.yaml
vendored
17
.github/workflows/ci_e2e-custom.yaml
vendored
|
|
@ -22,11 +22,12 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
php: [ "8.1" ]
|
||||
symfony: [ "^6.4" ]
|
||||
mysql: [ "8.0" ]
|
||||
resource: ["^1.11@dev"]
|
||||
grid: [ "^1.13@dev" ]
|
||||
php: ["8.2"]
|
||||
symfony: ["^6.4"]
|
||||
mysql: ["8.0"]
|
||||
resource: ["^1.12@alpha"]
|
||||
grid: ["^1.13@alpha"]
|
||||
mailer: ["^2.1@alpha"]
|
||||
|
||||
env:
|
||||
APP_ENV: test_cached
|
||||
|
|
@ -65,7 +66,11 @@ jobs:
|
|||
|
||||
- name: Require SyliusGridBundle version
|
||||
run: |
|
||||
composer require sylius/grid-bundle:${{ matrix.grid }} --no-update
|
||||
composer require sylius/grid-bundle:${{ matrix.grid }} --no-update
|
||||
|
||||
- name: Require SyliusMailerBundle version
|
||||
run: |
|
||||
composer require sylius/mailer-bundle:${{ matrix.mailer }} --no-update
|
||||
|
||||
- name: Build application
|
||||
uses: SyliusLabs/BuildTestAppAction@v2.2
|
||||
|
|
|
|||
6
.github/workflows/ci_e2e-unstable.yaml
vendored
6
.github/workflows/ci_e2e-unstable.yaml
vendored
|
|
@ -22,9 +22,9 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
php: [ "8.1" ]
|
||||
symfony: [ "^6.4" ]
|
||||
mysql: [ "8.0" ]
|
||||
php: ["8.2"]
|
||||
symfony: ["^6.4"]
|
||||
mysql: ["8.4"]
|
||||
|
||||
env:
|
||||
APP_ENV: test_cached
|
||||
|
|
|
|||
60
.github/workflows/matrix.json
vendored
60
.github/workflows/matrix.json
vendored
|
|
@ -19,13 +19,13 @@
|
|||
{
|
||||
"php": "8.1",
|
||||
"symfony": "^5.4",
|
||||
"mariadb": "10.4.10",
|
||||
"mariadb": "10.11.9",
|
||||
"state_machine_adapter": "winzou_state_machine"
|
||||
},
|
||||
{
|
||||
"php": "8.2",
|
||||
"symfony": "^6.4",
|
||||
"mariadb": "10.4.10",
|
||||
"mariadb": "11.4.3",
|
||||
"dbal": "^3.0",
|
||||
"state_machine_adapter": "symfony_workflow"
|
||||
}
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
"php": "8.2",
|
||||
"symfony": "^6.4",
|
||||
"api-platform": "^2.7.10",
|
||||
"mysql": "8.0",
|
||||
"mysql": "8.4",
|
||||
"twig": "^3.3"
|
||||
}
|
||||
]
|
||||
|
|
@ -54,12 +54,12 @@
|
|||
{
|
||||
"php": "8.1",
|
||||
"symfony": "^5.4",
|
||||
"postgres": "13.9"
|
||||
"postgres": "13.16"
|
||||
},
|
||||
{
|
||||
"php": "8.2",
|
||||
"symfony": "^6.4",
|
||||
"postgres": "14.6"
|
||||
"postgres": "16.4"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
@ -93,22 +93,22 @@
|
|||
},
|
||||
"full": {
|
||||
"static-checks": {
|
||||
"php": [ "8.1", "8.2" ],
|
||||
"symfony": [ "^5.4", "^6.4" ],
|
||||
"api-platform": [ "^2.7.10" ]
|
||||
"php": ["8.1", "8.2"],
|
||||
"symfony": ["^5.4", "^6.4"],
|
||||
"api-platform": ["^2.7.10"]
|
||||
},
|
||||
"e2e-mariadb": {
|
||||
"php": [ "8.1", "8.2" ],
|
||||
"symfony": [ "^5.4", "^6.4" ],
|
||||
"mariadb": [ "10.4.10" ],
|
||||
"state_machine_adapter": [ "winzou_state_machine", "symfony_workflow" ]
|
||||
"php": ["8.1", "8.2"],
|
||||
"symfony": ["^5.4", "^6.4"],
|
||||
"mariadb": ["10.11.9", "11.4.3"],
|
||||
"state_machine_adapter": ["winzou_state_machine", "symfony_workflow"]
|
||||
},
|
||||
"e2e-mysql": {
|
||||
"php": [ "8.1", "8.2" ],
|
||||
"symfony": [ "^5.4", "^6.4" ],
|
||||
"api-platform": [ "^2.7.10" ],
|
||||
"mysql": [ "8.0" ],
|
||||
"twig": [ "^3.3" ],
|
||||
"php": ["8.1", "8.2"],
|
||||
"symfony": ["^5.4", "^6.4"],
|
||||
"api-platform": ["^2.7.10"],
|
||||
"mysql": ["8.0", "8.4"],
|
||||
"twig": ["^3.3"],
|
||||
"include": [
|
||||
{
|
||||
"php": "8.1",
|
||||
|
|
@ -120,9 +120,21 @@
|
|||
]
|
||||
},
|
||||
"e2e-pgsql": {
|
||||
"php": [ "8.1", "8.2" ],
|
||||
"symfony": [ "^5.4", "^6.4" ],
|
||||
"postgres": [ "13.9", "14.6" ]
|
||||
"php": ["8.1", "8.2"],
|
||||
"symfony": ["^5.4", "^6.4"],
|
||||
"postgres": ["14.13", "15.8"],
|
||||
"include": [
|
||||
{
|
||||
"php": "8.1",
|
||||
"symfony": "^5.4",
|
||||
"postgres": "13.6"
|
||||
},
|
||||
{
|
||||
"php": "8.2",
|
||||
"symfony": "^6.4",
|
||||
"postgres": "16.4"
|
||||
}
|
||||
]
|
||||
},
|
||||
"frontend": {
|
||||
"include": [
|
||||
|
|
@ -135,12 +147,12 @@
|
|||
]
|
||||
},
|
||||
"packages": {
|
||||
"php": [ "8.1", "8.2" ],
|
||||
"symfony": [ "^5.4", "^6.4" ]
|
||||
"php": ["8.1", "8.2"],
|
||||
"symfony": ["^5.4", "^6.4"]
|
||||
},
|
||||
"packages-swiftmailer": {
|
||||
"php": [ "8.1" ],
|
||||
"symfony": [ "^5.4" ]
|
||||
"php": ["8.1"],
|
||||
"symfony": ["^5.4"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue