Merge pull request 'checkout before' (#3) from release/test2 into main

Reviewed-on: #3

.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/v0.1.0.md

@@ -0,0 +1,3 @@
+## v0.1.0 - 2023-11-02
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.9.2 to 2.9.2

.changes/v0.2.0.md

@@ -0,0 +1,3 @@
+## v0.2.0 - 2023-11-19
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.9.2 to 2.9.2

.changes/v0.3.0.md

@@ -0,0 +1,3 @@
+## v0.3.0 - 2023-11-19
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.9.2 to 2.12.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_

.gitea/workflows/release/create-release-on-tag.yaml

@@ -0,0 +1,19 @@
+name: Create release
+run-name: Create release on tag
+
+permissions:
+    contents: write
+
+on:
+    push:
+        tags:
+            - v*
+
+jobs:
+    create-release:
+        runs-on: ubuntu-latest
+        steps:
+            -   name: release
+                uses: https://github.com/softprops/action-gh-release@v1
+                with:
+                    body_path: ${{ github.workspace }}/.changes/v${{ github.ref }}.md

.gitea/workflows/release/tag-when-pr-merged-from-branch-release.yaml

@@ -0,0 +1,27 @@
+name: Tag next release
+run-name: Create a tag when PR is merged
+
+on:
+    pull_request_target:
+        types:
+            - closed
+        branches:
+            - 'main'
+
+jobs:
+    tag_if_merged:
+        if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/')
+        runs-on: ubuntu-latest
+        steps:
+            -   name: check out repository
+                uses: https://github.com/actions/checkout@v4
+            -   name: changie latest
+                id: changie_latest
+                uses: https://github.com/miniscruff/changie-action@v2
+                with:
+                    version: latest
+                    args: 'latest'
+            -   name: create a tag
+                uses: https://github.com/rickstaa/action-create-tag@v1
+                with:
+                    tag: ${{ steps.changie_latest.outputs.output }}

.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

.gitea/workflows/release_preparation.yaml

@@ -1,25 +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:
-        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)"
-                  commit_user_name: Action Bot
-                  commit_user_email: bot@chill.social
-

CHANGELOG.md

@@ -1,12 +1,19 @@
 # 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
+## v0.3.0 - 2023-11-19
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.9.2 to 2.12.1
 
+## v0.2.0 - 2023-11-19
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.9.2 to 2.9.2
+
+## v0.1.0 - 2023-11-02
+### Release
+* Update dependencies. Chill-bundles upgraded from 2.9.2 to 2.9.2

composer.json

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