From 2ec52540b95f538d7b4e06ac51ea37e11fcea438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20G=C3=A4chter?= Date: Wed, 1 May 2024 10:22:36 +0200 Subject: [PATCH] chore: Merge 1.x branch into 2.x * Use drafts for releases * chore(1.x): release 1.1.0 * Add compatibility with Timber 2.x * feat: Add compatibility for Timber 2.0 - Use timber/twig/functions' filter * Update Timber dependency * fix: Fix tests with Timber 2.0 * Remove compatibility with Timber 1.x * Update dependencies * Run release please on 2.x --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Nicolas Lemoine --- .release-please-manifest.json | 2 +- CHANGELOG.md | 14 ++++++++++++++ release-please-config.json | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 37fcefa..5fdd883 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "1.0.0" + ".": "1.1.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 461ddbd..7fc6a70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.1.0](https://github.com/mindkomm/timmy/compare/1.0.0...v1.1.0) (2024-03-26) + + +### Features + +* Optimize filter priority for deleting and generating image sizes ([2ec4013](https://github.com/mindkomm/timmy/commit/2ec40134fb81f13e95b6cb90c4a51da5daae3476)) + + +### Bug Fixes + +* Add release workflow ([#64](https://github.com/mindkomm/timmy/issues/64)) ([54b4d5e](https://github.com/mindkomm/timmy/commit/54b4d5ebeafa7127f12349a28435d440280ab73b)) +* Always export composer.json ([142efa9](https://github.com/mindkomm/timmy/commit/142efa97614325fa74d5570545268227275c3915)) +* Fix a PHP 8.1 deprecation ([cbce1f2](https://github.com/mindkomm/timmy/commit/cbce1f26aaa37701cd7f7bc6c4b1cccd0ee6ead9)) + ## 1.0.0 - Increased minimum supported PHP version to 7.4. diff --git a/release-please-config.json b/release-please-config.json index 579d2d9..ab3a334 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -5,7 +5,7 @@ "release-type": "php", "bump-minor-pre-major": false, "bump-patch-for-minor-pre-major": false, - "draft": false, + "draft": true, "prerelease": false } },