Compare commits

..

7 Commits

Author SHA1 Message Date
61a77cc1de Merge pull request 'update chill to release 2.16.1' (#13) from release/chill-2.16.1 into main
All checks were successful
continuous-integration/drone/tag Build is passing
Reviewed-on: #13
2024-02-08 23:15:49 +00:00
julienfastre
0c65d3d681 update composer.lock and file (automatic update) 2024-02-08 23:13:55 +00:00
9c125c6af6 update chill to release 2.16.1
All checks were successful
Prepare release for chill app / update-deps (push) Successful in 33s
2024-02-08 23:13:22 +00:00
e701b75f1e upgrade to node 20
Some checks failed
continuous-integration/drone/tag Build is failing
2024-02-09 00:00:13 +01:00
6c0caef3d5 release 1.4.4
Some checks failed
continuous-integration/drone/tag Build is failing
2024-02-08 22:58:06 +01:00
103282e44b restore previous version of yarn.lock 2024-02-08 22:57:12 +01:00
dd591628a8 better restriction for bootstrap version and release 1.4.3
Some checks failed
continuous-integration/drone/tag Build is failing
2024-02-08 22:38:38 +01:00
10 changed files with 1144 additions and 917 deletions

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

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

@@ -0,0 +1,3 @@
## v1.5.0 - 2024-02-08
### Release
* Update dependencies. Chill-bundles upgraded from 2.16.0 to 2.16.1

View File

@@ -37,10 +37,11 @@ steps:
- build-base-image - build-base-image
- name: build-assets - name: build-assets
image: node:16 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,18 @@ 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.5.0 - 2024-02-08
### Release
* Update dependencies. Chill-bundles upgraded from 2.16.0 to 2.16.1
## 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 ## v1.4.2 - 2024-02-08
### Fixed ### Fixed
* Fix version of bootstrap temporarily * Fix version of bootstrap temporarily

View File

@@ -15,7 +15,7 @@
}, },
"require": { "require": {
"ext-redis": "*", "ext-redis": "*",
"chill-project/chill-bundles": "2.16.0", "chill-project/chill-bundles": "2.16.1",
"symfony/flex": "^1.9", "symfony/flex": "^1.9",
"symfony/http-client": "^4.4 || ^5", "symfony/http-client": "^4.4 || ^5",
"nelmio/alice": "^3.8", "nelmio/alice": "^3.8",

14
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "8305e91891167e05d0a4a109477fa756", "content-hash": "aada3a5794021711f779fd1fd4b84586",
"packages": [ "packages": [
{ {
"name": "brick/math", "name": "brick/math",
@@ -223,16 +223,16 @@
}, },
{ {
"name": "chill-project/chill-bundles", "name": "chill-project/chill-bundles",
"version": "2.16.0", "version": "2.16.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://gitlab.com/Chill-Projet/chill-bundles.git", "url": "https://gitlab.com/Chill-Projet/chill-bundles.git",
"reference": "8b28667fe5d4430c541eacd0dc558b202c4f4835" "reference": "f02c5bca13882b075ca0edc0356090bd692cdc73"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=8b28667fe5d4430c541eacd0dc558b202c4f4835", "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=f02c5bca13882b075ca0edc0356090bd692cdc73",
"reference": "8b28667fe5d4430c541eacd0dc558b202c4f4835", "reference": "f02c5bca13882b075ca0edc0356090bd692cdc73",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -346,9 +346,9 @@
], ],
"support": { "support": {
"issues": "https://gitlab.com/Chill-Projet/chill-bundles/-/issues", "issues": "https://gitlab.com/Chill-Projet/chill-bundles/-/issues",
"source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/2.16.0" "source": "https://gitlab.com/Chill-Projet/chill-bundles/-/tree/2.16.1"
}, },
"time": "2024-02-08T21:21:49+00:00" "time": "2024-02-09T00:11:11+00:00"
}, },
{ {
"name": "composer/package-versions-deprecated", "name": "composer/package-versions-deprecated",

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",

2014
yarn.lock

File diff suppressed because it is too large Load Diff