Compare commits

..

10 Commits
1.5.0 ... main

25 changed files with 2548 additions and 3167 deletions

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

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

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

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

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -37,11 +37,10 @@ steps:
- build-base-image - build-base-image
- name: build-assets - name: build-assets
image: node:20 image: node:14
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
@@ -112,6 +111,6 @@ steps:
--- ---
kind: signature kind: signature
hmac: 0bca4dec9822a08338f6f3b88badf771558aee19b41967837aa64853a1573cad hmac: 707a5ef589fb6320f9e9e1dec7d8d4d11b477ba09e3b2b08d6f31f98d6d3f5d0
... ...

View File

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

View File

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

View File

@@ -56,4 +56,4 @@ jobs:
with: with:
commit_message: "update composer.lock and file (automatic update)" commit_message: "update composer.lock and file (automatic update)"
commit_user_name: Action Bot commit_user_name: Action Bot
commit_user_email: bot@chill.social commit_user_email: bot@chill.social

View File

@@ -6,43 +6,14 @@ 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 ## v0.3.0 - 2023-11-19
### Release ### Release
* Update dependencies. Chill-bundles upgraded from 2.16.0 to 2.16.1 * Update dependencies. Chill-bundles upgraded from 2.9.2 to 2.12.1
## v1.4.4 - 2024-02-08 ## v0.2.0 - 2023-11-19
### 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 ### Release
* Upgrade nodes dependencies * Update dependencies. Chill-bundles upgraded from 2.9.2 to 2.9.2
* Update dependencies. Chill-bundles upgraded from 2.14.1 to 2.16.0
## v1.3.0 - 2023-11-30 ## v0.1.0 - 2023-11-02
### Release ### Release
* Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1 * Update dependencies. Chill-bundles upgraded from 2.9.2 to 2.9.2
## 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": { "require": {
"ext-redis": "*", "ext-redis": "*",
"chill-project/chill-bundles": "2.16.1", "chill-project/chill-bundles": "2.12.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",

1151
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -36,5 +36,4 @@ return [
App\App::class => ['all' => true], App\App::class => ['all' => true],
KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true], KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true],
Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::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\Activity': '@ChillActivityBundle/migrations'
'Chill\Migrations\DocStore': '@ChillDocStoreBundle/migrations' 'Chill\Migrations\DocStore': '@ChillDocStoreBundle/migrations'
'Chill\Migrations\CustomFields': '@ChillCustomFieldsBundle/migrations' 'Chill\Migrations\CustomFields': '@ChillCustomFieldsBundle/migrations'
'Chill\Migrations\Event': '@ChillEventBundle/migrations' # 'Chill\Migrations\Event': '@ChillEventBundle/migrations'
'Chill\Migrations\Person': '@ChillPersonBundle/migrations' 'Chill\Migrations\Person': '@ChillPersonBundle/migrations'
'Chill\Migrations\Task': '@ChillTaskBundle/migrations' 'Chill\Migrations\Task': '@ChillTaskBundle/migrations'
'Chill\Migrations\ThirdParty': '@ChillThirdPartyBundle/migrations' 'Chill\Migrations\ThirdParty': '@ChillThirdPartyBundle/migrations'

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:20 ${cmd} node:16 ${cmd}

View File

@@ -3,9 +3,6 @@
"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",

4420
yarn.lock

File diff suppressed because it is too large Load Diff