Skip to content

Commit

Permalink
release: v0.1.0a4 (#68)
Browse files Browse the repository at this point in the history
  • Loading branch information
eonu authored Dec 4, 2023
2 parents 0dbb663 + 5a36336 commit a27ae1d
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 37 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/auto-master-dev-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Auto-merge master into dev

on:
pull_request:
branches: [master]
types: [closed]

jobs:
auto-merge:
if: github.event.pull_request.merged == true
timeout-minutes: 2
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Set Git config
run: |
git config --local user.email "actions@github.com"
git config --local user.name "Github Actions"
- name: Merge master back to dev
run: |
git fetch --unshallow
git checkout dev
git pull
git merge --no-ff master -m "chore(git): auto-merge master -> dev"
git push
78 changes: 45 additions & 33 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,76 @@

All notable changes to this project will be documented in this file.

## [0.1.0a3] - 2023-12-04
## [v0.1.0a4](https://github.com/eonu/feud/releases/tag/v0.1.0a4) - 2023-12-04

### Build System

- use cliff for changelog generation (#51)
- correctly access changelog entry content (#53)
- fix `tag-version-commit` workflow (#55)
- tag in create-release-pr workflow (#56)
- prefix tag with `v` (#57)
- use `rickstaa/action-create-tag` to create tags (#64)
- add auto-merge master into dev workflow ([#67](https://github.com/eonu/feud/issues/67))

### Documentation

- add `cliff.toml` issue/release number preprocessors ([#66](https://github.com/eonu/feud/issues/66))

### Release

- v0.1.0a3 ([#65](https://github.com/eonu/feud/issues/65))

## [v0.1.0a3](https://github.com/eonu/feud/releases/tag/v0.1.0a3) - 2023-12-04

### Build System

- use cliff for changelog generation ([#51](https://github.com/eonu/feud/issues/51))
- correctly access changelog entry content ([#53](https://github.com/eonu/feud/issues/53))
- fix `tag-version-commit` workflow ([#55](https://github.com/eonu/feud/issues/55))
- tag in create-release-pr workflow ([#56](https://github.com/eonu/feud/issues/56))
- prefix tag with `v` ([#57](https://github.com/eonu/feud/issues/57))
- use `rickstaa/action-create-tag` to create tags ([#64](https://github.com/eonu/feud/issues/64))

### Miscellaneous Tasks

- add `cliff.toml` (#50)
- add `cliff.toml` ([#50](https://github.com/eonu/feud/issues/50))

## [0.1.0a2] - 2023-12-04
## [v0.1.0a2](https://github.com/eonu/feud/releases/tag/v0.1.0a2) - 2023-12-04

### Bug Fixes

- use `actions/checkout@v4` and fix permissions (#28)
- add `write-all` permissions to `create-release-pr` workflow (#29)
- provide version to `auto-changelog` (#31)
- fix multi-line `create-release-pr` workflow output (#32)
- fetch tags in `create-release-pr` workflow (#34)
- use `fetch-depth: 0` for workflow checkout (#36)
- use temporary file for changelog entry (#37)
- remove invalid `)` from `create-release-pr` workflow (#38)
- use EOF for multi-line changelog output (#40)
- silence `release.install` invoke task (#42)
- remove `entry.md` from `create-release-pr` workflow (#44)
- provide start/stop commit to `create-release-pr` workflow (#46)
- use `actions/checkout@v4` and fix permissions ([#28](https://github.com/eonu/feud/issues/28))
- add `write-all` permissions to `create-release-pr` workflow ([#29](https://github.com/eonu/feud/issues/29))
- provide version to `auto-changelog` ([#31](https://github.com/eonu/feud/issues/31))
- fix multi-line `create-release-pr` workflow output ([#32](https://github.com/eonu/feud/issues/32))
- fetch tags in `create-release-pr` workflow ([#34](https://github.com/eonu/feud/issues/34))
- use `fetch-depth: 0` for workflow checkout ([#36](https://github.com/eonu/feud/issues/36))
- use temporary file for changelog entry ([#37](https://github.com/eonu/feud/issues/37))
- remove invalid `)` from `create-release-pr` workflow ([#38](https://github.com/eonu/feud/issues/38))
- use EOF for multi-line changelog output ([#40](https://github.com/eonu/feud/issues/40))
- silence `release.install` invoke task ([#42](https://github.com/eonu/feud/issues/42))
- remove `entry.md` from `create-release-pr` workflow ([#44](https://github.com/eonu/feud/issues/44))
- provide start/stop commit to `create-release-pr` workflow ([#46](https://github.com/eonu/feud/issues/46))

### Refactor

- remove `CHANGELOG.md` (#48)
- remove `CHANGELOG.md` ([#48](https://github.com/eonu/feud/issues/48))

### Release

- v0.1.0a2 ([#49](https://github.com/eonu/feud/issues/49))

- v0.1.0a2 (#49)

## [0.1.0a1] - 2023-12-03
## [v0.1.0a1](https://github.com/eonu/feud/releases/tag/v0.1.0a1) - 2023-12-03

### Features

- add `semantic-pull-request` action (#21)
- add `tag-version-commit` workflow (#22)
- add `poetry-publish` workflow (#24)
- add `action-automatic-releases` workflow (#25)
- add `create-release-pr` workflow (#26)
- add `semantic-pull-request` action ([#21](https://github.com/eonu/feud/issues/21))
- add `tag-version-commit` workflow ([#22](https://github.com/eonu/feud/issues/22))
- add `poetry-publish` workflow ([#24](https://github.com/eonu/feud/issues/24))
- add `action-automatic-releases` workflow ([#25](https://github.com/eonu/feud/issues/25))
- add `create-release-pr` workflow ([#26](https://github.com/eonu/feud/issues/26))

### Miscellaneous Tasks

- remove `pkg` scope from `tag-version-commit` workflow (#23)
- remove `pkg` scope from `tag-version-commit` workflow ([#23](https://github.com/eonu/feud/issues/23))

### Release


- v0.1.0a1 (#27)
- v0.1.0a1 ([#27](https://github.com/eonu/feud/issues/27))

<!-- generated by git-cliff -->
5 changes: 4 additions & 1 deletion cliff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@ footer = """
"""
# postprocessors
postprocessors = [
# { pattern = '<REPO>', replace = "https://github.com/orhun/git-cliff" }, # replace repository URL
{ pattern = '## \[([0-9]+\.[0-9]+\.[0-9]+[a-z0-9]*)\]', replace = "## [v${1}](https://github.com/eonu/feud/releases/tag/v${1})" },
{ pattern = '\(#([0-9]+)\)', replace = "([#${1}](https://github.com/eonu/feud/issues/${1}))" },
{ pattern = '\n\n\n', replace = "\n\n" },
]

[git]
# parse the commits based on https://www.conventionalcommits.org
conventional_commits = true
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
project = "feud"
copyright = "2023-2025, Feud Developers" # noqa: A001
author = "Edwin Onuonga (eonu)"
release = "0.1.0a3"
release = "0.1.0a4"

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down
2 changes: 1 addition & 1 deletion feud/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Not all arguments are bad.
"""

__version__ = "0.1.0a3"
__version__ = "0.1.0a4"

from feud import click as click
from feud import exceptions as exceptions
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "feud"
version = "0.1.0a3"
version = "0.1.0a4"
license = "MIT"
authors = ["Edwin Onuonga <ed@eonu.net>"]
maintainers = ["Edwin Onuonga <ed@eonu.net>"]
Expand Down

0 comments on commit a27ae1d

Please sign in to comment.