Merge pull request 'update chill to release 2.16.1' (#13) from release/chill-2.16.1 into main

Reviewed-on: #13

.changes/header.tpl.md

@@ -0,0 +1,6 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).

.changes/v1.0.0.md

@@ -0,0 +1,3 @@
+## v1.0.0 - 2023-11-19
+### Feature
+* Integrate changie and automate release management

.changes/v1.1.0.md

@@ -0,0 +1,3 @@
+## v1.1.0 - 2023-11-22
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.12.1 to 2.13.0

.changes/v1.2.0.md

@@ -0,0 +1,3 @@
+## v1.2.0 - 2023-11-24
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.13.0 to 2.14.0

.changes/v1.3.0.md

@@ -0,0 +1,3 @@
+## v1.3.0 - 2023-11-30
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1

.changes/v1.4.0.md

@@ -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

.changes/v1.4.1.md

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

.changes/v1.4.2.md

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

.changes/v1.4.3.md

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

.changes/v1.4.4.md

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

.changes/v1.5.0.md

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

.changie.yaml

@@ -0,0 +1,35 @@
+changesDir: .changes
+unreleasedDir: unreleased
+headerPath: header.tpl.md
+changelogPath: CHANGELOG.md
+versionExt: md
+versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
+kindFormat: '### {{.Kind}}'
+# Note: it is possible to add a `.custom.Long` text manually into the yaml file produced by `changie new`. This will add a long description.
+changeFormat: >-
+    * {{ if and (ne .Custom.Issue "") (ne .Custom.Issue "0") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{.Body}}
+custom:
+    -   key: Issue
+        label: Issue number (on chill-bundles repository) (optional)
+        optional: true
+        type: int
+kinds:
+    -   label: Release
+        auto: minor
+    -   label: Feature
+        auto: minor
+    -   label: Deprecated
+        auto: minor
+    -   label: Fixed
+        auto: patch
+    -   label: Security
+        auto: patch
+    -   label: DX
+        auto: patch
+    -   label: UX
+        auto: patch
+newlines:
+  afterChangelogHeader: 1
+  beforeChangelogVersion: 1
+  endOfVersion: 1
+envPrefix: CHANGIE_

.drone.yml

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

.gitea/workflows/release/update-composer-lock.yaml

@@ -0,0 +1,59 @@
+name: Prepare release for chill app
+run-name: Update composer.lock and dependencies for preparing a release
+
+on:
+    push:
+        branches:
+            - 'release/**'
+
+jobs:
+    update-deps:
+        runs-on: ubuntu-latest
+        steps:
+            - name: check out repository
+              uses: https://github.com/actions/checkout@v4
+            - name: get the previous chill version
+              # parse the composer.lock file using jq to get the chill version before the upgrade
+              id: chill-before
+              uses: https://github.com/sergeysova/jq-action@v2
+              with:
+                cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version'''
+            - name: run composer update to update composer.lock
+              uses: docker://gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:latest
+              with:
+                  # this is where we set the command to execute
+                  args: composer update --no-install
+            - name: is composer.lock changed ?
+              id: composer-lock-changed
+              run: 'echo is_composer_lock_changed=$(git diff --name-only | grep "composer\.lock" | wc -l) >> $GITHUB_OUTPUT'
+            - name: get the new chill version
+              # parse the composer.lock file using jq to get the chill version after the upgrade
+              id: chill-after
+              uses: https://github.com/sergeysova/jq-action@v2
+              with:
+                cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version'''
+            - name: add a changie file for the upgrade
+              uses: https://github.com/miniscruff/changie-action@v2
+              if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
+              with:
+                version: latest
+                args: 'new --body "Update dependencies. Chill-bundles upgraded from ${{ steps.chill-before.outputs.value }} to ${{ steps.chill-after.outputs.value }}" --kind Release --custom "Issue=0"'
+            - name: changie batch
+              if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
+              uses: https://github.com/miniscruff/changie-action@v2
+              with:
+                version: latest
+                args: 'batch auto'
+            - name: changie merge
+              if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
+              uses: https://github.com/miniscruff/changie-action@v2
+              with:
+                version: latest
+                args: 'merge'
+            - name: commit changed files
+              if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }}
+              uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
+              with:
+                  commit_message: "update composer.lock and file (automatic update)"
+                  commit_user_name: Action Bot
+                  commit_user_email: bot@chill.social

CHANGELOG.md

@@ -1,12 +1,48 @@
 # Changelog
-
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
 
-* [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for stable releases;
-* date versioning for test releases
 
-## Unreleased
+## 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
+### 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
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1
+
+## v1.2.0 - 2023-11-24
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.13.0 to 2.14.0
+
+## v1.1.0 - 2023-11-22
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.12.1 to 2.13.0
+
+## v1.0.0 - 2023-11-19
+### Feature
+* Integrate changie and automate release management

Makefile

@@ -2,12 +2,12 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
 PWD:=$(shell echo ${PWD})
 UID:=$(shell id -u)
 GID:=$(shell id -g)
-BASE_TAG=chill_base_php82
 DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16
 DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php
-DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(BASE_TAG)
+DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(PHP_BASE_IMAGE_TAG)
 PHP_BASE_IMAGE=php:8.2-fpm-alpine
-PHP_BASE_IMAGE_CHILL=chill_php82
+PHP_BASE_IMAGE_TARGET=chill_base_php82
+PHP_BASE_IMAGE_TAG=chill_php82
 NGINX_BASE_IMAGE=nginx
 CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
 ifneq (,$(wildcard ./.env))
@@ -39,7 +39,7 @@ build-assets:
 	$(DOCKERNODE_CMD) yarn run encore production
 
 init:
-	docker build --target $(PHP_BASE_IMAGE_CHILL) -t $(BASE_TAG) .
+	docker build --pull --target $(PHP_BASE_IMAGE_TARGET) --tag $(PHP_BASE_IMAGE_TAG) .
 	$(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction
 	@$(MAKE) -f $(THIS_FILE) build-assets
 	@$(MAKE) -f $(THIS_FILE) post-install

composer.json

@@ -15,7 +15,7 @@
     },
     "require": {
         "ext-redis": "*",
-        "chill-project/chill-bundles": "dev-master#a539febcfea6ea164d224db48bd903e0db60077b",
+        "chill-project/chill-bundles": "2.16.1",
         "symfony/flex": "^1.9",
         "symfony/http-client": "^4.4 || ^5",
         "nelmio/alice": "^3.8",
@@ -53,7 +53,8 @@
         "bin-dir": "bin",
         "allow-plugins": {
             "ocramius/package-versions": true,
-            "symfony/flex": true
+            "symfony/flex": true,
+            "symfony/runtime": true
         },
         "preferred-install": {
           "chill-project/chill-bundles": "source",

config/bundles.php

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

config/packages/doctrine_migrations.yaml

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

config/packages/framework.yaml

@@ -33,6 +33,3 @@ framework:
     ## sf4 check: ou à déplacer dans un chill.yaml
     assets:
         json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
-
-    templating:
-        engines: ['twig']

docker-node.sh

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

package.json

@@ -3,6 +3,9 @@
     "vendor/chill-project/chill-bundles"
   ],
   "private": true,
+  "devDependencies": {
+    "bootstrap": "5.2.3"
+  },
   "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-validate": "swagger-cli validate templates/api/specs.yaml",

symfony.lock

@@ -739,9 +739,6 @@
     "symfony/string": {
         "version": "v5.1.3"
     },
-    "symfony/templating": {
-        "version": "v4.4.11"
-    },
     "symfony/translation": {
         "version": "3.3",
         "recipe": {