forked from Chill-project/chill-skeleton-basic
Compare commits
21 Commits
php82
...
release/te
Author | SHA1 | Date | |
---|---|---|---|
bd011775a6
|
|||
f06b8dcd1e
|
|||
7f85d66337
|
|||
cc716beaec
|
|||
ac61038625 | |||
9827832753
|
|||
0706901415
|
|||
c4d3c784d3
|
|||
ce136ba0f3 | |||
05d4a10a5b
|
|||
|
c06166fdc2 | ||
fb1219163e
|
|||
52c40e5f52
|
|||
a144b0e4be
|
|||
8d310ef7c8 | |||
eff7e9470d | |||
cad7c0c53d | |||
c29f6cdf96
|
|||
430915f831
|
|||
63489e7055 | |||
6d8b858cc8 |
6
.changes/header.tpl.md
Normal file
6
.changes/header.tpl.md
Normal 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).
|
0
.changes/unreleased/.gitkeep
Normal file
0
.changes/unreleased/.gitkeep
Normal file
3
.changes/v1.0.0.md
Normal file
3
.changes/v1.0.0.md
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
## v1.0.0 - 2023-11-19
|
||||||
|
### Feature
|
||||||
|
* Integrate changie and automate release management
|
35
.changie.yaml
Normal file
35
.changie.yaml
Normal 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_
|
@@ -21,7 +21,7 @@ steps:
|
|||||||
registry: h3m6q87t.gra7.container-registry.ovh.net
|
registry: h3m6q87t.gra7.container-registry.ovh.net
|
||||||
repo: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base
|
repo: h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base
|
||||||
tag: latest
|
tag: latest
|
||||||
target: chill_base_php
|
target: chill_base_php82
|
||||||
pull_image: true
|
pull_image: true
|
||||||
cache_from:
|
cache_from:
|
||||||
- h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest
|
- h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest
|
||||||
@@ -103,12 +103,14 @@ steps:
|
|||||||
from_secret: docker_password_gitea
|
from_secret: docker_password_gitea
|
||||||
registry: gitea.champs-libres.be/chill-project/chill-skeleton-basic
|
registry: gitea.champs-libres.be/chill-project/chill-skeleton-basic
|
||||||
repo: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image
|
repo: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image
|
||||||
tag: php82
|
tag:
|
||||||
|
- php82
|
||||||
|
- latest
|
||||||
target: chill_base_php82
|
target: chill_base_php82
|
||||||
pull_image: true
|
pull_image: true
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: signature
|
kind: signature
|
||||||
hmac: 212da184e3fedeb03530cc66dbf9c8974e461e214dda5a698b11012e66e4531a
|
hmac: 707a5ef589fb6320f9e9e1dec7d8d4d11b477ba09e3b2b08d6f31f98d6d3f5d0
|
||||||
|
|
||||||
...
|
...
|
||||||
|
16
.gitea/workflows/release/create-release-on-tag.yaml
Normal file
16
.gitea/workflows/release/create-release-on-tag.yaml
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
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
|
11
CHANGELOG.md
11
CHANGELOG.md
@@ -1,12 +1,11 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
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/),
|
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.0.0 - 2023-11-19
|
||||||
|
### Feature
|
||||||
|
* Integrate changie and automate release management
|
||||||
|
8
Makefile
8
Makefile
@@ -2,12 +2,12 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
|
|||||||
PWD:=$(shell echo ${PWD})
|
PWD:=$(shell echo ${PWD})
|
||||||
UID:=$(shell id -u)
|
UID:=$(shell id -u)
|
||||||
GID:=$(shell id -g)
|
GID:=$(shell id -g)
|
||||||
BASE_TAG=chill_base_php82
|
|
||||||
DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16
|
DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16
|
||||||
DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php
|
DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php
|
||||||
DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(BASE_TAG)
|
DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(PHP_BASE_IMAGE_TAG)
|
||||||
PHP_BASE_IMAGE=php:8.2-fpm-alpine
|
PHP_BASE_IMAGE=php:8.2-fpm-alpine
|
||||||
PHP_BASE_IMAGE_CHILL=chill_php82
|
PHP_BASE_IMAGE_TARGET=chill_base_php82
|
||||||
|
PHP_BASE_IMAGE_TAG=chill_php82
|
||||||
NGINX_BASE_IMAGE=nginx
|
NGINX_BASE_IMAGE=nginx
|
||||||
CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
|
CALVER=$(shell date "+v%Y%m%d%H%M")-${CALVERSION}
|
||||||
ifneq (,$(wildcard ./.env))
|
ifneq (,$(wildcard ./.env))
|
||||||
@@ -39,7 +39,7 @@ build-assets:
|
|||||||
$(DOCKERNODE_CMD) yarn run encore production
|
$(DOCKERNODE_CMD) yarn run encore production
|
||||||
|
|
||||||
init:
|
init:
|
||||||
docker build --target $(PHP_BASE_IMAGE_CHILL) -t $(BASE_TAG) .
|
docker build --pull --target $(PHP_BASE_IMAGE_TARGET) --tag $(PHP_BASE_IMAGE_TAG) .
|
||||||
$(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction
|
$(DOCKER_PHP_EXEC_CMD_BASE) composer update --no-scripts --no-interaction
|
||||||
@$(MAKE) -f $(THIS_FILE) build-assets
|
@$(MAKE) -f $(THIS_FILE) build-assets
|
||||||
@$(MAKE) -f $(THIS_FILE) post-install
|
@$(MAKE) -f $(THIS_FILE) post-install
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-redis": "*",
|
"ext-redis": "*",
|
||||||
"chill-project/chill-bundles": "dev-master#3c88630edc1e449824dd6d2cfd91699e2cb47f86",
|
"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",
|
||||||
@@ -36,8 +36,7 @@
|
|||||||
"symfony/web-profiler-bundle": "^5.0",
|
"symfony/web-profiler-bundle": "^5.0",
|
||||||
"symfony/var-dumper": "4.*",
|
"symfony/var-dumper": "4.*",
|
||||||
"symfony/phpunit-bridge": "^5.2",
|
"symfony/phpunit-bridge": "^5.2",
|
||||||
"symfony/debug-bundle": "^5.1",
|
"symfony/debug-bundle": "^5.1"
|
||||||
"box/spout": "^3.3"
|
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
"prefer-stable": true,
|
"prefer-stable": true,
|
||||||
@@ -54,7 +53,8 @@
|
|||||||
"bin-dir": "bin",
|
"bin-dir": "bin",
|
||||||
"allow-plugins": {
|
"allow-plugins": {
|
||||||
"ocramius/package-versions": true,
|
"ocramius/package-versions": true,
|
||||||
"symfony/flex": true
|
"symfony/flex": true,
|
||||||
|
"symfony/runtime": true
|
||||||
},
|
},
|
||||||
"preferred-install": {
|
"preferred-install": {
|
||||||
"chill-project/chill-bundles": "source",
|
"chill-project/chill-bundles": "source",
|
||||||
|
2166
composer.lock
generated
2166
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -13,7 +13,6 @@ return [
|
|||||||
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
|
Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
|
||||||
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
|
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
|
||||||
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
|
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
|
||||||
Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => 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],
|
ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true],
|
||||||
|
@@ -1,4 +0,0 @@
|
|||||||
# See https://symfony.com/doc/current/email/dev_environment.html
|
|
||||||
swiftmailer:
|
|
||||||
# send all emails to a specific address
|
|
||||||
#delivery_addresses: ['me@example.com']
|
|
@@ -33,6 +33,3 @@ framework:
|
|||||||
## sf4 check: ou à déplacer dans un chill.yaml
|
## sf4 check: ou à déplacer dans un chill.yaml
|
||||||
assets:
|
assets:
|
||||||
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
|
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
|
||||||
|
|
||||||
templating:
|
|
||||||
engines: ['twig']
|
|
||||||
|
@@ -9,6 +9,8 @@ framework:
|
|||||||
transports:
|
transports:
|
||||||
# https://symfony.com/doc/current/messenger.html#transport-configuration
|
# https://symfony.com/doc/current/messenger.html#transport-configuration
|
||||||
async: '%env(MESSENGER_TRANSPORT_DSN)%'
|
async: '%env(MESSENGER_TRANSPORT_DSN)%'
|
||||||
|
priority:
|
||||||
|
dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
|
||||||
failed: 'doctrine://default?queue_name=failed'
|
failed: 'doctrine://default?queue_name=failed'
|
||||||
# sync: 'sync://'
|
# sync: 'sync://'
|
||||||
|
|
||||||
@@ -22,3 +24,4 @@ framework:
|
|||||||
'Chill\CalendarBundle\Messenger\Message\InviteUpdateMessage': async
|
'Chill\CalendarBundle\Messenger\Message\InviteUpdateMessage': async
|
||||||
'Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage': async
|
'Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage': async
|
||||||
'Chill\MainBundle\Service\ShortMessage\ShortMessage': async
|
'Chill\MainBundle\Service\ShortMessage\ShortMessage': async
|
||||||
|
'Chill\DocGeneratorBundle\Service\Messenger\RequestGenerationMessage': priority
|
||||||
|
@@ -1,3 +0,0 @@
|
|||||||
swiftmailer:
|
|
||||||
url: '%env(MAILER_URL)%'
|
|
||||||
spool: { type: 'memory' }
|
|
@@ -1,2 +0,0 @@
|
|||||||
swiftmailer:
|
|
||||||
disable_delivery: true
|
|
26
symfony.lock
26
symfony.lock
@@ -1,7 +1,4 @@
|
|||||||
{
|
{
|
||||||
"box/spout": {
|
|
||||||
"version": "v3.3.0"
|
|
||||||
},
|
|
||||||
"brick/math": {
|
"brick/math": {
|
||||||
"version": "0.9.3"
|
"version": "0.9.3"
|
||||||
},
|
},
|
||||||
@@ -451,9 +448,6 @@
|
|||||||
"spomky-labs/base64url": {
|
"spomky-labs/base64url": {
|
||||||
"version": "v2.0.4"
|
"version": "v2.0.4"
|
||||||
},
|
},
|
||||||
"swiftmailer/swiftmailer": {
|
|
||||||
"version": "v6.2.5"
|
|
||||||
},
|
|
||||||
"symfony/asset": {
|
"symfony/asset": {
|
||||||
"version": "v4.4.11"
|
"version": "v4.4.11"
|
||||||
},
|
},
|
||||||
@@ -659,9 +653,6 @@
|
|||||||
"symfony/polyfill-ctype": {
|
"symfony/polyfill-ctype": {
|
||||||
"version": "v1.18.0"
|
"version": "v1.18.0"
|
||||||
},
|
},
|
||||||
"symfony/polyfill-iconv": {
|
|
||||||
"version": "v1.22.0"
|
|
||||||
},
|
|
||||||
"symfony/polyfill-intl-grapheme": {
|
"symfony/polyfill-intl-grapheme": {
|
||||||
"version": "v1.18.0"
|
"version": "v1.18.0"
|
||||||
},
|
},
|
||||||
@@ -748,23 +739,6 @@
|
|||||||
"symfony/string": {
|
"symfony/string": {
|
||||||
"version": "v5.1.3"
|
"version": "v5.1.3"
|
||||||
},
|
},
|
||||||
"symfony/swiftmailer-bundle": {
|
|
||||||
"version": "2.5",
|
|
||||||
"recipe": {
|
|
||||||
"repo": "github.com/symfony/recipes",
|
|
||||||
"branch": "master",
|
|
||||||
"version": "2.5",
|
|
||||||
"ref": "ae4d22af30bbd484506bc1817c5a3ef72c855b93"
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
"config/packages/dev/swiftmailer.yaml",
|
|
||||||
"config/packages/swiftmailer.yaml",
|
|
||||||
"config/packages/test/swiftmailer.yaml"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"symfony/templating": {
|
|
||||||
"version": "v4.4.11"
|
|
||||||
},
|
|
||||||
"symfony/translation": {
|
"symfony/translation": {
|
||||||
"version": "3.3",
|
"version": "3.3",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
@@ -14,13 +14,6 @@ Save activity: Sauver l'échange
|
|||||||
'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'échange n'a pas été créé.
|
'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'échange n'a pas été créé.
|
||||||
'Success : activity updated!': L'échange a été mis à jour.
|
'Success : activity updated!': L'échange a été mis à jour.
|
||||||
'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'échange n'a pas été mis à jour.
|
'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'échange n'a pas été mis à jour.
|
||||||
CHILL_ACTIVITY_CREATE: Créer un échange
|
|
||||||
CHILL_ACTIVITY_UPDATE: Modifier un échange
|
|
||||||
CHILL_ACTIVITY_SEE: Voir un échange
|
|
||||||
CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des échanges
|
|
||||||
CHILL_ACTIVITY_DELETE: Supprimer un échange
|
|
||||||
CHILL_ACTIVITY_STATS: Statistique des échanges
|
|
||||||
CHILL_ACTIVITY_LIST: Liste des échanges
|
|
||||||
Activity configuration: Configuration des échanges
|
Activity configuration: Configuration des échanges
|
||||||
Activity configuration menu: Configuration des échanges
|
Activity configuration menu: Configuration des échanges
|
||||||
Activity Types: Types d'échange
|
Activity Types: Types d'échange
|
||||||
|
Reference in New Issue
Block a user