From 7b9cc5db487fb685c92d9706ebd3f862c26576a7 Mon Sep 17 00:00:00 2001 From: Edwin Onuonga Date: Mon, 4 Dec 2023 23:58:34 +0000 Subject: [PATCH 1/2] build(git): use `setup-git-credentials` for auto-merge workflow (#71) --- .github/workflows/auto-master-dev-merge.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-master-dev-merge.yml b/.github/workflows/auto-master-dev-merge.yml index 329e1c0..494f7cf 100644 --- a/.github/workflows/auto-master-dev-merge.yml +++ b/.github/workflows/auto-master-dev-merge.yml @@ -12,12 +12,11 @@ jobs: permissions: write-all runs-on: ubuntu-latest steps: + - uses: de-vri-es/setup-git-credentials@v2 + with: + credentials: ${{secrets.AUTO_MERGE_SECRET}} - 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 From 3e1d8683c68a9d937f98add78c6248d107a9eb32 Mon Sep 17 00:00:00 2001 From: eonu Date: Tue, 5 Dec 2023 00:00:05 +0000 Subject: [PATCH 2/2] release: v0.1.0a6 --- CHANGELOG.md | 13 +++++++++++++ docs/source/conf.py | 2 +- feud/__init__.py | 2 +- pyproject.toml | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 716bc42..4062fb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ All notable changes to this project will be documented in this file. +## [v0.1.0a6](https://github.com/eonu/feud/releases/tag/v0.1.0a6) - 2023-12-05 + +### Build System + +- use `setup-git-credentials` for auto-merge workflow ([#71](https://github.com/eonu/feud/issues/71)) + +### Miscellaneous Tasks + + +### Release + +- v0.1.0a5 ([#70](https://github.com/eonu/feud/issues/70)) + ## [v0.1.0a5](https://github.com/eonu/feud/releases/tag/v0.1.0a5) - 2023-12-04 ### Build System diff --git a/docs/source/conf.py b/docs/source/conf.py index 052e6b0..839f1f6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -20,7 +20,7 @@ project = "feud" copyright = "2023-2025, Feud Developers" # noqa: A001 author = "Edwin Onuonga (eonu)" -release = "0.1.0a5" +release = "0.1.0a6" # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/feud/__init__.py b/feud/__init__.py index f56626c..2df4269 100644 --- a/feud/__init__.py +++ b/feud/__init__.py @@ -7,7 +7,7 @@ Not all arguments are bad. """ -__version__ = "0.1.0a5" +__version__ = "0.1.0a6" from feud import click as click from feud import exceptions as exceptions diff --git a/pyproject.toml b/pyproject.toml index 312f01b..813fee4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "feud" -version = "0.1.0a5" +version = "0.1.0a6" license = "MIT" authors = ["Edwin Onuonga "] maintainers = ["Edwin Onuonga "]