Compare commits

...

27 Commits

Author SHA1 Message Date
6c0caef3d5 release 1.4.4 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 2024-02-08 22:38:38 +01:00
656d27080b release 1.4.2 2024-02-08 22:13:30 +01:00
8d1693285d fix version of bootstrap to 5.2.3 2024-02-08 22:10:52 +01:00
818b4c36a3 upgrade node version and update 1.4.1 2024-02-08 21:53:25 +01:00
0fb57fcdd8 Merge pull request 'upgrade chill to version 2.16.0' (#12) from release/chill-2.16.0 into main
Reviewed-on: Chill-project/chill-skeleton-basic#12
2024-02-08 20:31:04 +00:00
julienfastre
c8d89e2a1d update composer.lock and file (automatic update) 2024-02-08 20:26:12 +00:00
d142fbe471 upgrade chill to version 2.16.0 2024-02-08 20:24:58 +00:00
deadabefa1 Merge pull request 'activate bundle event in app' (#7) from 6-activate-event-bundle into main
Reviewed-on: Chill-project/chill-skeleton-basic#7
2024-02-08 20:23:54 +00:00
2c9ec9db55 Revert "Add configuration for chill-doc-store into skeleton"
This reverts commit 4aea2fe135.
2023-12-12 15:57:56 +01:00
4aea2fe135 Add configuration for chill-doc-store into skeleton 2023-12-12 15:17:18 +01:00
6fe97f3659 Merge pull request 'update chill to release 2.14.1' (#8) from release/chill-2.14.1 into main
Reviewed-on: Chill-project/chill-skeleton-basic#8
2023-11-30 08:27:55 +00:00
julienfastre
d9980a7e18 update composer.lock and file (automatic update) 2023-11-30 08:27:10 +00:00
59852c709d update chill to release 2.14.1 2023-11-30 08:25:54 +00:00
f7dc506506 upgrade node dependencies 2023-11-29 13:21:26 +01:00
8ef752fdd0 activate bundle event in app 2023-11-27 13:24:34 +01:00
1c544d392a Merge pull request 'Prepare for release - chill 2.14.0' (#5) from release/chill-2.14.0 into main
Reviewed-on: Chill-project/chill-skeleton-basic#5
2023-11-24 11:41:27 +00:00
julienfastre
dcfd7e4924 update composer.lock and file (automatic update) 2023-11-24 11:40:51 +00:00
deb47dd3aa Prepare for release - chill 2.14.0 2023-11-24 11:40:19 +00:00
ac909e8107 Merge pull request 'update to chill-bundles 2.13.0 - prepare for release' (#4) from release/chill-2.13.0 into main
Reviewed-on: Chill-project/chill-skeleton-basic#4
2023-11-22 15:35:12 +00:00
julienfastre
414b4e11ca update composer.lock and file (automatic update) 2023-11-22 15:34:21 +00:00
86e27595f5 restore release workflow 2023-11-22 15:33:33 +00:00
cb3ac56084 delete create-release-on-tag 2023-11-22 15:32:28 +00:00
4ef93ef722 update to chill-bundles 2.13.0 - prepare for release 2023-11-22 15:31:11 +00:00
7e3d741ea0 Merge pull request 'Integrate changie and create a workflow for publishing app' (#3) from julienfastre/chill-skeleton-basic:release/test2 into main
Reviewed-on: Chill-project/chill-skeleton-basic#3
2023-11-19 20:55:48 +00:00
bd011775a6 Integrate changie and create a workflow for publishing app
update composer.lock and file (automatic update)

prepare for realease

Signed-off-by: Julien Fastré <julienfastre@noreply.localhost>

update composer.lock and file (automatic update)

Workflow: tag and create release

Fix expressions

checkout before

remove permissions

finalize
2023-11-19 21:55:02 +01:00
21 changed files with 883 additions and 654 deletions

6
.changes/header.tpl.md Normal file
View File

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

View File

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

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

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

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

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

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

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

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

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

35
.changie.yaml Normal file
View File

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

View File

@@ -37,7 +37,7 @@ steps:
- build-base-image
- name: build-assets
image: node:14
image: node:16
pull: always
commands:
- yarn install

View File

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

View File

@@ -1,12 +1,44 @@
# 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.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

View File

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

1355
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -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],
];

View File

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

View File

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

View File

@@ -2783,7 +2783,7 @@ boolbase@^1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
bootstrap@^5.0.1:
bootstrap@5.2.3:
version "5.2.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b"
integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==