Skip to content

Commit

Permalink
chore: Merge 1.x branch into 2.x
Browse files Browse the repository at this point in the history
* 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 <nico.lemoine@gmail.com>
  • Loading branch information
3 people authored May 1, 2024
1 parent 1687f3f commit 2ec5254
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "1.0.0"
".": "1.1.0"
}
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
},
Expand Down

0 comments on commit 2ec5254

Please sign in to comment.