Skip to content

Commit

Permalink
Merge branch 'release/0.7.17'
Browse files Browse the repository at this point in the history
  • Loading branch information
eliashaeussler committed Nov 11, 2022
2 parents 99ee6fd + 97d30fc commit 8aafec4
Show file tree
Hide file tree
Showing 16 changed files with 9,479 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/.gitignore export-ignore
/.php-cs-fixer.php export-ignore
/codecov.yml export-ignore
/composer.lock export-ignore
/dependency-checker.json export-ignore
/docker-compose.yml export-ignore
/packaging_exclude.php export-ignore
Expand Down
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,25 @@ updates:
- dependencies
open-pull-requests-limit: 10

- package-ecosystem: composer
directory: '/'
schedule:
interval: daily
commit-message:
prefix: '[TASK]'
target-branch: develop
labels:
- dependencies
open-pull-requests-limit: 10
versioning-strategy: increase-if-necessary

- package-ecosystem: composer
directory: 'Resources/Private/Libs/Build'
schedule:
interval: daily
commit-message:
prefix: '[TASK]'
target-branch: develop
labels:
- dependencies
open-pull-requests-limit: 10
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/auto-merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Dependabot auto-merge
on:
pull_request:
types: [opened]

jobs:
dependabot-auto-merge:
if: ${{ github.actor == 'dependabot[bot]' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
target: minor
github-token: ${{ secrets.MERGE_TOKEN }}
10 changes: 7 additions & 3 deletions .github/workflows/cgl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,23 @@ jobs:
with:
php-version: 8.1
tools: composer:v2, composer-require-checker, composer-unused
coverage: none

# Validation
- name: Validate composer.json
run: composer validate --no-check-lock
run: composer validate

# Install dependencies
- name: Install Composer dependencies
run: composer update --no-progress --no-plugins
uses: ramsey/composer-install@v2
with:
composer-options: --no-plugins

# Check Composer dependencies
- name: Check dependencies
run: composer-require-checker check --config-file dependency-checker.json
- run: composer install --no-progress
- name: Re-install Composer dependencies
uses: ramsey/composer-install@v2
- name: Check for unused dependencies
run: composer-unused

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
# Create release
- name: Create release
id: create-release
uses: softprops/action-gh-release@v1
uses: ncipollo/release-action@v1
with:
generate_release_notes: true
generateReleaseNotes: true

# Job: Publish on TER
ter-publish:
Expand All @@ -53,9 +53,9 @@ jobs:
# Prepare version
- id: get-version
run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
- id: get-comment
run: echo ::set-output name=comment::See release notes at ${{ needs.release.outputs.release-notes-url }}
run: echo "comment=See release notes at ${{ needs.release.outputs.release-notes-url }}" >> $GITHUB_OUTPUT

# Prepare environment
- name: Setup PHP
Expand All @@ -64,6 +64,7 @@ jobs:
php-version: 7.4
extensions: intl, mbstring, json, zip, curl
tools: composer:v2
coverage: none

# Build dependencies
- name: Build dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
working-directory: .Build/log/coverage
run: sed -i 's#/home/runner/work/handlebars/handlebars#${{ github.workspace }}#g' clover.xml
- name: CodeClimate report
uses: paambaati/codeclimate-action@v3.0.0
uses: paambaati/codeclimate-action@v3.2.0
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
with:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
/var/
/.php-cs-fixer.cache
/.phpunit.result.cache
/composer.lock
15 changes: 15 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
2022-11-11 [RELEASE] Release of handlebars 0.7.17 (Elias Häußler)
2022-11-11 cc66366 [TASK] Enable Dependabot auto-merge for minor and patch updates (Elias Häußler)
2022-11-10 747e4b2 [TASK]: Bump symfony/polyfill-php80 in /Resources/Private/Libs/Build (dependabot[bot])
2022-11-11 5a4bdc9 [TASK] Switch to `ncipollo/release-action` for new releases (Elias Häußler)
2022-11-11 23bb1e3 [BUGFIX] Disable coverage in all unrelated jobs (Elias Häußler)
2022-11-11 8e9c21c [BUGFIX] Create Dependabot PRs against develop branch (Elias Häußler)
2022-11-11 0246e16 [TASK] Add `composer.lock` and enable Dependabot updates (Elias Häußler)
2022-11-11 462adb5 [TASK] Make closure in Services.php static (Elias Häußler)
2022-11-11 44c316a [BUGFIX] Skip Rector's class name import in some files (Elias Häußler)
2022-10-21 27653a1 [TASK]: Bump paambaati/codeclimate-action from 3.1.1 to 3.2.0 (dependabot[bot])
2022-10-20 e32be3e [TASK]: Bump paambaati/codeclimate-action from 3.1.0 to 3.1.1 (dependabot[bot])
2022-10-15 38f3744 [TASK]: Bump paambaati/codeclimate-action from 3.0.0 to 3.1.0 (dependabot[bot])
2022-10-16 9186f94 [BUGFIX] Replace deprecated job outputs in GitHub workflows (Elias Häußler)
2022-10-13 690e546 [DOCS] Add supported TYPO3 versions badge to README.md (Elias Häußler)

2022-10-13 [RELEASE] Release of handlebars 0.7.16 (Elias Häußler)
2022-10-13 b3539a6 [TASK] Build non-composer mode libraries with PHP 7.4 (Elias Häußler)
2022-10-13 ba091fb [TASK] Configure Dependabot for updates of non-composer mode libraries (Elias Häußler)
Expand Down
2 changes: 1 addition & 1 deletion Configuration/Services.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return function (/** @noinspection PhpUnusedParameterInspection */ ContainerConfigurator $containerConfigurator, ContainerBuilder $container) {
return static function (ContainerConfigurator $containerConfigurator, ContainerBuilder $container): void {
$container->registerExtension(new Extension\HandlebarsExtension());
$container->addCompilerPass(new DataProcessorPass('handlebars.processor', 'handlebars.compatibility_layer'));
$container->addCompilerPass(new HandlebarsHelperPass('handlebars.helper', 'handlebars.renderer'));
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Settings.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[general]
project = Handlebars
release = 0.7.16
release = 0.7.17
copyright = since 2020 by coding. powerful. systems. CPS GmbH
author = Elias Häußler

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
[![License](http://poser.pugx.org/cpsit/typo3-handlebars/license)](LICENSE.md)\
[![Version](https://shields.io/endpoint?url=https://typo3-badges.dev/badge/handlebars/version/shields)](https://extensions.typo3.org/extension/handlebars)
[![Downloads](https://shields.io/endpoint?url=https://typo3-badges.dev/badge/handlebars/downloads/shields)](https://extensions.typo3.org/extension/handlebars)
[![Supported TYPO3 versions](https://shields.io/endpoint?url=https://typo3-badges.dev/badge/handlebars/typo3/shields)](https://extensions.typo3.org/extension/handlebars)
[![Extension stability](https://shields.io/endpoint?url=https://typo3-badges.dev/badge/handlebars/stability/shields)](https://extensions.typo3.org/extension/handlebars)
[![TYPO3 badge](https://shields.io/endpoint?url=https://typo3-badges.dev/badge/typo3/shields)](https://typo3.org/)

**:orange_book: [Documentation](https://docs.typo3.org/p/cpsit/typo3-handlebars/main/en-us/)** |
:package: [Packagist](https://packagist.org/packages/cpsit/typo3-handlebars) |
Expand Down
14 changes: 7 additions & 7 deletions Resources/Private/Libs/Build/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"@lint:php",
"@lint:typoscript"
],
"lint:composer": "@composer normalize --no-check-lock --no-update-lock",
"lint:composer": "@composer normalize",
"lint:editorconfig": "ec --fix -e .Build",
"lint:php": "php-cs-fixer fix",
"lint:typoscript": "typoscript-lint -c typoscript-lint.yml",
Expand Down
Loading

0 comments on commit 8aafec4

Please sign in to comment.