Compare commits
16 Commits
bd011775a6
...
merge-asyn
Author | SHA1 | Date | |
---|---|---|---|
1f6e5a807b
|
|||
db4effd727
|
|||
2c9ec9db55
|
|||
4aea2fe135
|
|||
6fe97f3659 | |||
|
d9980a7e18 | ||
59852c709d | |||
1c544d392a | |||
|
dcfd7e4924 | ||
deb47dd3aa | |||
ac909e8107 | |||
|
414b4e11ca | ||
86e27595f5 | |||
cb3ac56084 | |||
4ef93ef722 | |||
7e3d741ea0 |
3
.changes/v1.1.0.md
Normal file
3
.changes/v1.1.0.md
Normal 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
3
.changes/v1.2.0.md
Normal 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
3
.changes/v1.3.0.md
Normal 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
|
@@ -1,16 +0,0 @@
|
|||||||
name: Create release
|
|
||||||
run-name: Create release on tag
|
|
||||||
|
|
||||||
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
|
|
59
.gitea/workflows/release/update-composer-lock.yaml
Normal file
59
.gitea/workflows/release/update-composer-lock.yaml
Normal 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
|
12
CHANGELOG.md
12
CHANGELOG.md
@@ -6,6 +6,18 @@ 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.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
|
## v1.0.0 - 2023-11-19
|
||||||
### Feature
|
### Feature
|
||||||
* Integrate changie and automate release management
|
* Integrate changie and automate release management
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-redis": "*",
|
"ext-redis": "*",
|
||||||
"chill-project/chill-bundles": "2.12.1",
|
"chill-project/chill-bundles": "2.14.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",
|
||||||
|
440
composer.lock
generated
440
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -15,7 +15,6 @@ return [
|
|||||||
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
|
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
|
||||||
Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true],
|
Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true],
|
||||||
Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true],
|
Knp\Bundle\TimeBundle\KnpTimeBundle::class => ['all' => true],
|
||||||
ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true],
|
|
||||||
Chill\MainBundle\ChillMainBundle::class => ['all' => true],
|
Chill\MainBundle\ChillMainBundle::class => ['all' => true],
|
||||||
Chill\PersonBundle\ChillPersonBundle::class => ['all' => true],
|
Chill\PersonBundle\ChillPersonBundle::class => ['all' => true],
|
||||||
Chill\CustomFieldsBundle\ChillCustomFieldsBundle::class => ['all' => true],
|
Chill\CustomFieldsBundle\ChillCustomFieldsBundle::class => ['all' => true],
|
||||||
|
@@ -1,14 +0,0 @@
|
|||||||
champs_libres_async_uploader:
|
|
||||||
openstack:
|
|
||||||
os_username: '%env(resolve:OS_USERNAME)%' # Required
|
|
||||||
os_password: '%env(resolve:OS_PASSWORD)%' # Required
|
|
||||||
os_tenant_id: '%env(resolve:OS_TENANT_ID)%' # Required
|
|
||||||
os_region_name: '%env(resolve:OS_REGION_NAME)%' # Required
|
|
||||||
os_auth_url: '%env(resolve:OS_AUTH_URL)%' # Required
|
|
||||||
temp_url:
|
|
||||||
temp_url_key: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%' # Required
|
|
||||||
container: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required
|
|
||||||
temp_url_base_path: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required. Do not forget a trailing slash
|
|
||||||
max_post_file_size: 15000000 # 15Mo (bytes)
|
|
||||||
max_expires_delay: 180
|
|
||||||
max_submit_delay: 3600
|
|
6
config/packages/chill_doc_store.yaml
Normal file
6
config/packages/chill_doc_store.yaml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
chill_doc_store:
|
||||||
|
openstack:
|
||||||
|
temp_url:
|
||||||
|
temp_url_key: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%' # Required
|
||||||
|
container: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required
|
||||||
|
temp_url_base_path: '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required
|
Reference in New Issue
Block a user