Skip to content

Commit

Permalink
Merge pull request #44 from Nr18/develop
Browse files Browse the repository at this point in the history
chore: release 0.4.0
  • Loading branch information
Joris Conijn authored Feb 20, 2022
2 parents 5c8594b + b038143 commit 227515b
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ jobs:
run: make install
- name: Run check
run: make build
- uses: release-drafter/release-drafter@v5
id: release_notes
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Create Release
id: create_release
uses: actions/create-release@v1
Expand All @@ -33,11 +37,9 @@ jobs:
with:
tag_name: v${{ steps.vars.outputs.version }}
release_name: Release v${{ steps.vars.outputs.version }}
body: ${{ steps.release_notes.outputs.body }}
draft: false
prerelease: false
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
Expand Down
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ To use `pull-request-codecommit` you just execute the following command:
pull-request-codecommit
```

Or:

```bash
git pr
```

### Auto merge

In some cases it makes sense to directly merge the pull request, in those cases you can use:
Expand All @@ -64,6 +70,12 @@ In some cases it makes sense to directly merge the pull request, in those cases
pull-request-codecommit --auto-merge
```

Or:

```bash
git pr --auto-merge
```

This will directly merge the pull request using the fast-forward merge strategy.
If the merge is successful, it will:

Expand All @@ -86,6 +98,12 @@ When you want to overwrite the target branch you need to supply the `--branch <n
pull-request-codecommit --branch my-target-branch
```

Or:

```bash
git pr --branch my-target-branch
```

## Testing locally

```bash
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pull-request-codecommit"
version = "0.3.2"
version = "0.4.0"
description = "pull-request-codecommit creates a PR within CodeCommit based on your commit messages."
authors = ["Joris Conijn <joris@conijnonline.nl>"]
license = "MIT"
Expand All @@ -23,6 +23,7 @@ radon = "^5.1.0"

[tool.poetry.scripts]
pull-request-codecommit = "pull_request_codecommit:main"
git-pr = "pull_request_codecommit:main"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
packages=setuptools.find_packages(where="."),
install_requires=[
"click==8.0.3",
"junit-xml==1.9",
],
entry_points={
"console_scripts": [
"pull-request-codecommit = pull_request_codecommit:main",
"git-pr = pull_request_codecommit:main",
],
},
python_requires=">=3.8",
Expand Down

0 comments on commit 227515b

Please sign in to comment.