Skip to content

Commit b0f130e

Browse files
giancosta86github-actions[bot]
authored andcommitted
In tag-and-release, set rebase as the default value for git-strategy
1 parent cd4b108 commit b0f130e

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

actions/tag-and-release/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Merges a pull request, creates a **Git** tag and publishes a **GitHub** release,
77
```yaml
88
steps:
99
- uses: giancosta86/aurora-github/actions/tag-and-release@v10
10-
with:
11-
git-strategy: rebase
1210
```
1311
1412
It is essential to remember that this action must be called:
@@ -74,7 +72,7 @@ More generally, this action should be _the very last step_ in a manually-trigger
7472

7573
| Name | Type | Description | Default value |
7674
| :--------------------: | :-----------------------: | :-------------------------------------------------------: | :-----------: |
77-
| `git-strategy` | `merge`,`rebase`,`squash` | How to apply the pull request to the Git repository | |
75+
| `git-strategy` | `merge`,`rebase`,`squash` | How to apply the pull request to the Git repository | **rebase** |
7876
| `draft-release` | **boolean** | Draft the release - do not publish it | **false** |
7977
| `notes-file-processor` | **string** | Bash script editing the generated release notes | |
8078
| `set-major-tag` | **boolean** | Create/move the `vX` tag to this commit (X=major version) | **false** |

actions/tag-and-release/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ inputs:
1919

2020
git-strategy:
2121
description: How to apply the pull request to the Git repository. Can be `merge`, `rebase` or `squash`.
22+
default: rebase
2223

2324
outputs:
2425
release-tag:

0 commit comments

Comments
 (0)