update composer.lock and file (automatic update through CI)

.changes/header.tpl.md

@@ -1,6 +0,0 @@
-# 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

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

.changes/v1.1.0.md

@@ -1,3 +0,0 @@
-## 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

@@ -1,3 +0,0 @@
-## 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

@@ -1,3 +0,0 @@
-## 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

@@ -1,4 +0,0 @@
-## 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

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

.changie.yaml

@@ -1,35 +0,0 @@
-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,7 +37,7 @@ steps:
           - build-base-image
 
     - name: build-assets
-      image: node:16
+      image: node:14
       pull: always
       commands:
           - yarn install

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

@@ -1,59 +0,0 @@
-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

.gitea/workflows/release_preparation.yaml

@@ -0,0 +1,25 @@
+name: Prepare release for chill app
+run-name: Update composer.lock and dependencies for preparing a release
+
+on:
+    push:
+        branches:
+            - 'release/**'
+
+jobs:
+    update-deps:
+        steps:
+            - name: check out repository
+              uses: https://github.com/actions/checkout@v4
+            - 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: commit changed files
+              uses: https://github.com/stefanzweifel/git-auto-commit-action@v5
+              with:
+                  commit_message: "update composer.lock and file (automatic update through CI)"
+                  commit_user_name: Action Bot
+                  commit_user_email: bot@chill.social
+

CHANGELOG.md

@@ -1,32 +1,12 @@
 # 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 this project adheres to
-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
 
-## v1.4.1 - 2024-02-08
+## Unreleased
-### 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

composer.json

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

config/bundles.php

@@ -36,5 +36,4 @@ 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'