Skip to content

Commit

Permalink
Merge branch 'orhun:main' into feature/addMoreTests
Browse files Browse the repository at this point in the history
  • Loading branch information
R11baka authored Jun 5, 2024
2 parents d730579 + e270235 commit d76d74c
Show file tree
Hide file tree
Showing 18 changed files with 212 additions and 68 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,31 @@
[![animation](https://raw.githubusercontent.com/orhun/git-cliff/main/website/static/img/git-cliff-anim.gif)](https://git-cliff.org)

## [2.3.0](https://github.com/orhun/git-cliff/compare/v2.2.2..v2.3.0) - 2024-06-03

### ⛰️ Features

- *(bitbucket)* Add Bitbucket support ([#663](https://github.com/orhun/git-cliff/issues/663)) - ([8ffc054](https://github.com/orhun/git-cliff/commit/8ffc0548fe0fd8930627412fecb9bc08a7879504))
- *(gitlab)* [**breaking**] Add GitLab support ([#654](https://github.com/orhun/git-cliff/issues/654)) - ([b490f2a](https://github.com/orhun/git-cliff/commit/b490f2a24e3ebeb6ee54382ce9aa642ecff17b01))
- *(output)* Support using stdout via dash (`-o -`) ([#644](https://github.com/orhun/git-cliff/issues/644)) - ([df81f63](https://github.com/orhun/git-cliff/commit/df81f636f53e63d305d06944ff014a21612cb666))

### 🐛 Bug Fixes

- *(args)* Allow -o and -p together if they point to different files ([#653](https://github.com/orhun/git-cliff/issues/653)) - ([076f859](https://github.com/orhun/git-cliff/commit/076f85915386c4769c838ca9a359d216249d2a97))

### 📚 Documentation

- *(nix)* Add installation instructions for Nix ([#669](https://github.com/orhun/git-cliff/issues/669)) - ([63c8ad4](https://github.com/orhun/git-cliff/commit/63c8ad43e9ecaa825ef1f0a67164265497f3a1dd))
- *(website)* Add highlights for 2.3.0 ([#670](https://github.com/orhun/git-cliff/issues/670)) - ([1338703](https://github.com/orhun/git-cliff/commit/1338703a2aedb4116dcae849ada4941432f57e74))
- *(website)* Clean up Nix docs - ([2c2a300](https://github.com/orhun/git-cliff/commit/2c2a300616fa151b91858a2a7d88bdc9b9dae497))
- *(website)* Add more git range examples ([#655](https://github.com/orhun/git-cliff/issues/655)) - ([d451252](https://github.com/orhun/git-cliff/commit/d4512521fbcfb971c94aa7794d78bced1ddec7a1))

### ⚙️ Miscellaneous Tasks

- *(cd)* Use macos-14 runner - ([22c94ed](https://github.com/orhun/git-cliff/commit/22c94ed8355d71a5fe99d8c1e9c8a3824338debf))
- *(example)* Allow using github template without github variables ([#672](https://github.com/orhun/git-cliff/issues/672)) - ([6a9feba](https://github.com/orhun/git-cliff/commit/6a9feba98f36de1980bab313f6b0a861f5009d71))
- *(links)* Ignore patreon links - ([bfe2774](https://github.com/orhun/git-cliff/commit/bfe27744701296185d2f1d37dba7cfb48bd70519))
- *(npm)* Update yarn.lock - ([1c2b4ac](https://github.com/orhun/git-cliff/commit/1c2b4ac85b49f62ae6f19660e7e47b3bc24a5cae))

## [2.2.2](https://github.com/orhun/git-cliff/compare/v2.2.1..v2.2.2) - 2024-05-11

### ⛰️ Features
Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions cliff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ commit_parsers = [
{ message = "^chore\\(deps.*\\)", skip = true },
{ message = "^chore\\(pr\\)", skip = true },
{ message = "^chore\\(pull\\)", skip = true },
{ message = "^chore\\(npm\\).*yarn\\.lock", skip = true },
{ message = "^chore|^ci", group = "<!-- 7 -->⚙️ Miscellaneous Tasks" },
{ body = ".*security", group = "<!-- 8 -->🛡️ Security" },
{ message = "^revert", group = "<!-- 9 -->◀️ Revert" },
Expand Down
2 changes: 2 additions & 0 deletions examples/github.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ body = """
{%- endif %}
{%- endfor -%}
{%- if github -%}
{% if github.contributors | filter(attribute="is_first_time", value=true) | length != 0 %}
{% raw %}\n{% endraw -%}
## New Contributors
Expand All @@ -36,6 +37,7 @@ body = """
[#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \
{%- endif %}
{%- endfor -%}
{%- endif -%}
{% if version %}
{% if previous.version %}
Expand Down
4 changes: 2 additions & 2 deletions git-cliff-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "git-cliff-core"
version = "2.2.2" # managed by release.sh
version = "2.3.0" # managed by release.sh
description = "Core library of git-cliff"
authors = ["git-cliff contributors <[email protected]>"]
license = "MIT OR Apache-2.0"
Expand Down Expand Up @@ -61,7 +61,7 @@ serde_json = "1.0.117"
serde_regex = "1.1.0"
tera = "1.20.0"
indexmap = { version = "2.2.6", optional = true }
toml = "0.8.13"
toml = "0.8.14"
lazy-regex = "3.1.0"
next_version = "0.2.17"
semver = "1.0.23"
Expand Down
4 changes: 2 additions & 2 deletions git-cliff/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "git-cliff"
version = "2.2.2" # managed by release.sh
version = "2.3.0" # managed by release.sh
description = "A highly customizable changelog generator ⛰️"
authors = ["git-cliff contributors <[email protected]>"]
license = "MIT OR Apache-2.0"
Expand Down Expand Up @@ -49,7 +49,7 @@ indicatif = { version = "0.17.8", optional = true }
env_logger = "0.10.2"

[dependencies.git-cliff-core]
version = "2.2.2" # managed by release.sh
version = "2.3.0" # managed by release.sh
path = "../git-cliff-core"

[dev-dependencies]
Expand Down
14 changes: 7 additions & 7 deletions npm/git-cliff/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "git-cliff",
"version": "2.2.2",
"version": "2.3.0",
"description": "A highly customizable Changelog Generator that follows Conventional Commit specifications ⛰️",
"type": "module",
"main": "lib/cjs/index.d.cts",
Expand Down Expand Up @@ -88,12 +88,12 @@
"typescript": "^5.3.3"
},
"optionalDependencies": {
"git-cliff-darwin-arm64": "2.2.2",
"git-cliff-darwin-x64": "2.2.2",
"git-cliff-linux-arm64": "2.2.2",
"git-cliff-linux-x64": "2.2.2",
"git-cliff-windows-arm64": "2.2.2",
"git-cliff-windows-x64": "2.2.2"
"git-cliff-darwin-arm64": "2.3.0",
"git-cliff-darwin-x64": "2.3.0",
"git-cliff-linux-arm64": "2.3.0",
"git-cliff-linux-x64": "2.3.0",
"git-cliff-windows-arm64": "2.3.0",
"git-cliff-windows-x64": "2.3.0"
},
"eslintConfig": {
"extends": [
Expand Down
48 changes: 24 additions & 24 deletions npm/git-cliff/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1371,44 +1371,44 @@ __metadata:
languageName: node
linkType: hard

"git-cliff-darwin-arm64@npm:2.2.2":
version: 2.2.2
resolution: "git-cliff-darwin-arm64@npm:2.2.2"
"git-cliff-darwin-arm64@npm:2.3.0":
version: 2.3.0
resolution: "git-cliff-darwin-arm64@npm:2.3.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"git-cliff-darwin-x64@npm:2.2.2":
version: 2.2.2
resolution: "git-cliff-darwin-x64@npm:2.2.2"
"git-cliff-darwin-x64@npm:2.3.0":
version: 2.3.0
resolution: "git-cliff-darwin-x64@npm:2.3.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"git-cliff-linux-arm64@npm:2.2.2":
version: 2.2.2
resolution: "git-cliff-linux-arm64@npm:2.2.2"
"git-cliff-linux-arm64@npm:2.3.0":
version: 2.3.0
resolution: "git-cliff-linux-arm64@npm:2.3.0"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard

"git-cliff-linux-x64@npm:2.2.2":
version: 2.2.2
resolution: "git-cliff-linux-x64@npm:2.2.2"
"git-cliff-linux-x64@npm:2.3.0":
version: 2.3.0
resolution: "git-cliff-linux-x64@npm:2.3.0"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard

"git-cliff-windows-arm64@npm:2.2.2":
version: 2.2.2
resolution: "git-cliff-windows-arm64@npm:2.2.2"
"git-cliff-windows-arm64@npm:2.3.0":
version: 2.3.0
resolution: "git-cliff-windows-arm64@npm:2.3.0"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"git-cliff-windows-x64@npm:2.2.2":
version: 2.2.2
resolution: "git-cliff-windows-x64@npm:2.2.2"
"git-cliff-windows-x64@npm:2.3.0":
version: 2.3.0
resolution: "git-cliff-windows-x64@npm:2.3.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
Expand All @@ -1422,12 +1422,12 @@ __metadata:
"@typescript-eslint/parser": "npm:^7.1.0"
eslint: "npm:^8.57.0"
execa: "npm:^8.0.1"
git-cliff-darwin-arm64: "npm:2.2.2"
git-cliff-darwin-x64: "npm:2.2.2"
git-cliff-linux-arm64: "npm:2.2.2"
git-cliff-linux-x64: "npm:2.2.2"
git-cliff-windows-arm64: "npm:2.2.2"
git-cliff-windows-x64: "npm:2.2.2"
git-cliff-darwin-arm64: "npm:2.3.0"
git-cliff-darwin-x64: "npm:2.3.0"
git-cliff-linux-arm64: "npm:2.3.0"
git-cliff-linux-x64: "npm:2.3.0"
git-cliff-windows-arm64: "npm:2.3.0"
git-cliff-windows-x64: "npm:2.3.0"
tsup: "npm:^8.0.2"
typescript: "npm:^5.3.3"
dependenciesMeta:
Expand Down
2 changes: 1 addition & 1 deletion website/blog/git-cliff-2.2.0.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
slug: 2.2.0
title: "What's new in 2.2.0? \U0001F195"
title: What's new in 2.2.0?
date: 2024-03-30T00:00:00.000Z
authors: orhun
tags:
Expand Down
123 changes: 123 additions & 0 deletions website/blog/git-cliff-2.3.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
---
slug: 2.3.0
title: "What's new in 2.3.0? \U0001F195"
date: 2024-06-03T00:00:00.000Z
authors: orhun
tags:
- release
---

<center>

<a href="https://github.com/orhun/git-cliff">
<img src="/img/git-cliff-anim.gif" />
</a>

</center>

> [**git-cliff**](https://github.com/orhun/git-cliff) is a command-line tool (written in [Rust](https://www.rust-lang.org/)) that provides a highly customizable way to generate changelogs from git history.
>
> It supports using [custom regular expressions](/docs/configuration/git#commit_parsers) to alter changelogs which are mostly based on [conventional commits](/docs/configuration/git#conventional_commits). With a single [configuration file](/docs/configuration), a wide variety of formats can be applied for a changelog, thanks to the Jinja2/Django-inspired [template engine](/docs/category/templating).
>
> More information and examples can be found in the [GitHub repository](https://github.com/orhun/git-cliff).
## What's new? ⛰️

The full changelog can be found [here](https://github.com/orhun/git-cliff/blob/main/CHANGELOG.md).

---

### 🦊 GitLab Integration

`git-cliff` now supports integrating with repositories hosted on GitLab (gitlab.com or your own instance)!

This means that you can now use the following variables in your changelog:

- GitLab usernames (`${{ commit.gitlab.username }}` or `${{ contributor.username }}`)
- Contributors list (`${{ gitlab.contributors }}`)
- Pull requests (`${{ commit.gitlab.pr_number }}` or `${{ contributor.pr_number }}`)

Which means you can generate a changelog entries like the following:

```md
## What's Changed

- feat(commit): add merge_commit flag to the context by @orhun in !389
- test(fixture): add test fixture for bumping version by @orhun in !360

## New Contributors

- @someone made their first contribution in !360
- @cliffjumper made their first contribution in !389

<!-- generated by git-cliff -->
```

To set up `git-cliff` for your project, simply:

1. Check out the [quickstart guide](https://git-cliff.org/docs/) for installation / initialization.
1. Set up the [Git remote](https://git-cliff.org/docs/configuration/remote/) for your GitLab project.
1. Update the changelog configuration to use the [template variables](https://git-cliff.org/docs/integration/gitlab/).

:::tip

See the [GitLab integration](https://git-cliff.org/docs/integration/gitlab) for detailed documentation and usage examples. It works very similar to the [GitHub integration](https://git-cliff.org/docs/integration/github).

:::

Big thanks to [dark0dave](https://github.com/dark0dave) for the [contribution](https://github.com/orhun/git-cliff/issues/654)!

---

### 📘 Bitbucket Integration

`git-cliff` now supports integrating with repositories hosted on Bitbucket!

It works similarly with GitHub and GitLab integrations. See the [documentation](https://git-cliff.org/docs/integration/bitbucket) for details and usage examples.

Big thanks to [dark0dave](https://github.com/dark0dave) for the [contribution](https://github.com/orhun/git-cliff/issues/654)!

---

### 📤 Output to stdout

Using `-` for `stdout` is common among CLI tools and `git-cliff` now supports this!

```
$ git-cliff -o -
```

You can simply use `-` instead instead of `-o /dev/stdout`. It can also be used in conjunction with `-p` argument as mentioned in [this issue](https://github.com/orhun/git-cliff/issues/643).

---

### 🧰 Other

- _(nix)_ Add installation instructions for Nix ([#669](https://github.com/orhun/git-cliff/issues/669)) - ([63c8ad4](https://github.com/orhun/git-cliff/commit/63c8ad43e9ecaa825ef1f0a67164265497f3a1dd))
- _(website)_ Add more git range examples ([#655](https://github.com/orhun/git-cliff/issues/655)) - ([d451252](https://github.com/orhun/git-cliff/commit/d4512521fbcfb971c94aa7794d78bced1ddec7a1))
- _(args)_ Allow -o and -p together if they point to different files ([#653](https://github.com/orhun/git-cliff/issues/653)) - ([076f859](https://github.com/orhun/git-cliff/commit/076f85915386c4769c838ca9a359d216249d2a97))
- _(example)_ Allow using github template without github variables ([#672](https://github.com/orhun/git-cliff/issues/672)) - ([6a9feba](https://github.com/orhun/git-cliff/commit/6a9feba98f36de1980bab313f6b0a861f5009d71))

---

## Contributions 👥

- @R11baka made their first contribution in [#672](https://github.com/orhun/git-cliff/pull/672)
- @0x61nas made their first contribution in [#669](https://github.com/orhun/git-cliff/pull/669)
- @dark0dave made their first contribution in [#663](https://github.com/orhun/git-cliff/pull/663)
- @antonengelhardt made their first contribution in [#653](https://github.com/orhun/git-cliff/pull/653)

Any contribution is highly appreciated! See the [contribution guidelines](https://github.com/orhun/git-cliff/blob/main/CONTRIBUTING.md) for getting started.

Feel free to [submit issues](https://github.com/orhun/git-cliff/issues/new/choose) and join our [Discord](https://discord.gg/W3mAwMDWH4) / [Matrix](https://matrix.to/#/#git-cliff:matrix.org) for discussion!

Follow `git-cliff` on [Twitter](https://twitter.com/git_cliff) & [Mastodon](https://fosstodon.org/@git_cliff) to not miss any news!

## Support 🌟

If you liked `git-cliff` and/or my other projects [on GitHub](https://github.com/orhun), consider [donating](https://donate.orhun.dev) to support my open source endeavors.

- 💖 GitHub Sponsors: [@orhun](https://github.com/sponsors/orhun)
- ☕ Buy Me A Coffee: [https://www.buymeacoffee.com/orhun](https://www.buymeacoffee.com/orhun)

Have a fantastic day! ⛰️
2 changes: 1 addition & 1 deletion website/docs/integration/bitbucket.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sidebar_position: 3
---

# Bitbucket Integration 🆕
# Bitbucket Integration 📘

:::warning

Expand Down
2 changes: 1 addition & 1 deletion website/docs/integration/github.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sidebar_position: 1
---

# GitHub Integration 🆕
# GitHub Integration 🐙

:::warning

Expand Down
2 changes: 1 addition & 1 deletion website/docs/integration/gitlab.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sidebar_position: 2
---

# GitLab Integration 🆕
# GitLab Integration 🦊

:::warning

Expand Down
Loading

0 comments on commit d76d74c

Please sign in to comment.