Merge branch 'main' into upgrade-sf5

This commit is contained in:
Julien Fastré 2024-02-11 22:20:04 +01:00
commit fecb561b3b
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
13 changed files with 4274 additions and 3749 deletions

4
.changes/v1.4.0.md Normal file
View File

@ -0,0 +1,4 @@
## v1.4.0 - 2024-02-08
### Release
* Upgrade nodes dependencies
* Update dependencies. Chill-bundles upgraded from 2.14.1 to 2.16.0

3
.changes/v1.4.1.md Normal file
View File

@ -0,0 +1,3 @@
## v1.4.1 - 2024-02-08
### Fixed
* upgrade node version while compiling

3
.changes/v1.4.2.md Normal file
View File

@ -0,0 +1,3 @@
## v1.4.2 - 2024-02-08
### Fixed
* Fix version of bootstrap temporarily

3
.changes/v1.4.3.md Normal file
View File

@ -0,0 +1,3 @@
## v1.4.3 - 2024-02-08
### Fixed
* better restriction for bootstrap version

3
.changes/v1.4.4.md Normal file
View File

@ -0,0 +1,3 @@
## v1.4.4 - 2024-02-08
### Fixed
* fix incorrect upgrade

View File

@ -37,10 +37,11 @@ steps:
- build-base-image - build-base-image
- name: build-assets - name: build-assets
image: node:14 image: node:20
pull: always pull: always
commands: commands:
- yarn install - yarn install
- yarn list
- yarn run encore production - yarn run encore production
depends_on: depends_on:
- composer-install - composer-install
@ -111,6 +112,6 @@ steps:
--- ---
kind: signature kind: signature
hmac: 707a5ef589fb6320f9e9e1dec7d8d4d11b477ba09e3b2b08d6f31f98d6d3f5d0 hmac: 0bca4dec9822a08338f6f3b88badf771558aee19b41967837aa64853a1573cad
... ...

View File

@ -6,6 +6,27 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie). and is generated by [Changie](https://github.com/miniscruff/changie).
## v1.4.4 - 2024-02-08
### Fixed
* fix incorrect upgrade
## v1.4.3 - 2024-02-08
### Fixed
* better restriction for bootstrap version
## v1.4.2 - 2024-02-08
### Fixed
* Fix version of bootstrap temporarily
## v1.4.1 - 2024-02-08
### Fixed
* upgrade node version while compiling
## v1.4.0 - 2024-02-08
### Release
* Upgrade nodes dependencies
* Update dependencies. Chill-bundles upgraded from 2.14.1 to 2.16.0
## v1.3.0 - 2023-11-30 ## v1.3.0 - 2023-11-30
### Release ### Release
* Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1 * Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1

3579
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -35,4 +35,5 @@ return [
App\App::class => ['all' => true], App\App::class => ['all' => true],
KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true], KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true],
Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true], Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
Chill\EventBundle\ChillEventBundle::class => ['all' => true],
]; ];

View File

@ -7,7 +7,7 @@ doctrine_migrations:
'Chill\Migrations\Activity': '@ChillActivityBundle/migrations' 'Chill\Migrations\Activity': '@ChillActivityBundle/migrations'
'Chill\Migrations\DocStore': '@ChillDocStoreBundle/migrations' 'Chill\Migrations\DocStore': '@ChillDocStoreBundle/migrations'
'Chill\Migrations\CustomFields': '@ChillCustomFieldsBundle/migrations' 'Chill\Migrations\CustomFields': '@ChillCustomFieldsBundle/migrations'
# 'Chill\Migrations\Event': '@ChillEventBundle/migrations' 'Chill\Migrations\Event': '@ChillEventBundle/migrations'
'Chill\Migrations\Person': '@ChillPersonBundle/migrations' 'Chill\Migrations\Person': '@ChillPersonBundle/migrations'
'Chill\Migrations\Task': '@ChillTaskBundle/migrations' 'Chill\Migrations\Task': '@ChillTaskBundle/migrations'
'Chill\Migrations\ThirdParty': '@ChillThirdPartyBundle/migrations' 'Chill\Migrations\ThirdParty': '@ChillThirdPartyBundle/migrations'

View File

@ -18,4 +18,4 @@ docker run \
--volume ${PWD}:/app \ --volume ${PWD}:/app \
--workdir /app \ --workdir /app \
--env YARN_CACHE_FOLDER=/app/.yarncache \ --env YARN_CACHE_FOLDER=/app/.yarncache \
node:16 ${cmd} node:20 ${cmd}

View File

@ -3,6 +3,9 @@
"vendor/chill-project/chill-bundles" "vendor/chill-project/chill-bundles"
], ],
"private": true, "private": true,
"devDependencies": {
"bootstrap": "5.2.3"
},
"scripts": { "scripts": {
"specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml", "specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
"specs-validate": "swagger-cli validate templates/api/specs.yaml", "specs-validate": "swagger-cli validate templates/api/specs.yaml",

4394
yarn.lock

File diff suppressed because it is too large Load Diff