mirror of
https://github.com/stefanzweifel/git-auto-commit-action.git
synced 2026-01-12 12:18:26 +00:00
Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04702edda4 | ||
|
|
1e49d5001f | ||
|
|
65c56779c9 | ||
|
|
547c1409ce | ||
|
|
8fa7f5a3c5 | ||
|
|
28e16e8177 | ||
|
|
698fd76863 | ||
|
|
c40819ab3b | ||
|
|
d7ee275235 | ||
|
|
e8684eb0cd | ||
|
|
19497011bb | ||
|
|
a88dc49508 | ||
|
|
a531deca6b | ||
|
|
acbe8b15bf | ||
|
|
d1854850ec | ||
|
|
e9f84b936b | ||
|
|
d2e5cae4c6 | ||
|
|
858005f1b9 | ||
|
|
9a4902607d | ||
|
|
d330c718ba | ||
|
|
5fe35a088d | ||
|
|
2da8d963b4 | ||
|
|
7ddc571aec | ||
|
|
01d77ca6cb | ||
|
|
6371fedd09 | ||
|
|
f9017b24ee | ||
|
|
66f124b8c2 |
2
.github/workflows/git-auto-commit.yml
vendored
2
.github/workflows/git-auto-commit.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.head_ref }}
|
ref: ${{ github.head_ref }}
|
||||||
|
|
||||||
|
|||||||
2
.github/workflows/linter.yml
vendored
2
.github/workflows/linter.yml
vendored
@@ -9,7 +9,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Lint Code Base
|
- name: Lint Code Base
|
||||||
uses: github/super-linter@v7
|
uses: github/super-linter@v7
|
||||||
|
|||||||
2
.github/workflows/tests.yml
vendored
2
.github/workflows/tests.yml
vendored
@@ -11,7 +11,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Install testing dependencies
|
- name: Install testing dependencies
|
||||||
run: yarn install
|
run: yarn install
|
||||||
|
|||||||
4
.github/workflows/update-changelog.yaml
vendored
4
.github/workflows/update-changelog.yaml
vendored
@@ -16,7 +16,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
ref: master
|
ref: master
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ jobs:
|
|||||||
latest-version: ${{ github.event.release.name }}
|
latest-version: ${{ github.event.release.name }}
|
||||||
|
|
||||||
- name: Commit updated CHANGELOG
|
- name: Commit updated CHANGELOG
|
||||||
uses: stefanzweifel/git-auto-commit-action@v5
|
uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
with:
|
with:
|
||||||
branch: master
|
branch: master
|
||||||
commit_message: Update CHANGELOG
|
commit_message: Update CHANGELOG
|
||||||
|
|||||||
24
CHANGELOG.md
24
CHANGELOG.md
@@ -5,10 +5,32 @@ All notable changes to this project will be documented in this file.
|
|||||||
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
|
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
|
||||||
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
## [Unreleased](https://github.com/stefanzweifel/git-auto-commit-action/compare/v6.0.0...HEAD)
|
## [Unreleased](https://github.com/stefanzweifel/git-auto-commit-action/compare/v7.0.0...HEAD)
|
||||||
|
|
||||||
> TBD
|
> TBD
|
||||||
|
|
||||||
|
## [v7.0.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v6.0.1...v7.0.0) - 2025-10-12
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Restore skip_fetch, skip_checkout, create_branch ([#388](https://github.com/stefanzweifel/git-auto-commit-action/pull/388)) [@stefanzweifel](https://github.com/@stefanzweifel)
|
||||||
|
- Restore Detached State Detection ([#393](https://github.com/stefanzweifel/git-auto-commit-action/pull/393)) [@stefanzweifel](https://github.com/@stefanzweifel)
|
||||||
|
- Add Support for Tag Messages ([#391](https://github.com/stefanzweifel/git-auto-commit-action/pull/391)) [@EliasBoulharts](https://github.com/@EliasBoulharts)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Run Action on Node 24 ([#389](https://github.com/stefanzweifel/git-auto-commit-action/pull/389)) [@stefanzweifel](https://github.com/@stefanzweifel)
|
||||||
|
|
||||||
|
### Dependency Updates
|
||||||
|
|
||||||
|
- Bump actions/checkout from 4 to 5 ([#386](https://github.com/stefanzweifel/git-auto-commit-action/pull/386)) [@[dependabot[bot]](https://github.com/apps/dependabot)](https://github.com/@[dependabot[bot]](https://github.com/apps/dependabot))
|
||||||
|
|
||||||
|
## [v6.0.1](https://github.com/stefanzweifel/git-auto-commit-action/compare/v6.0.0...v6.0.1) - 2025-06-11
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Disable Check if Repo is in Detached State ([#379](https://github.com/stefanzweifel/git-auto-commit-action/pull/379)) [@stefanzweifel](https://github.com/@stefanzweifel)
|
||||||
|
|
||||||
## [v6.0.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v5.2.0...v6.0.0) - 2025-06-10
|
## [v6.0.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v5.2.0...v6.0.0) - 2025-06-10
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
64
README.md
64
README.md
@@ -19,7 +19,7 @@ Adding git-auto-commit to your Workflow only takes a couple lines of code.
|
|||||||
2. Add the following step at the end of your job, after other steps that might add or change files.
|
2. Add the following step at the end of your job, after other steps that might add or change files.
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
```
|
```
|
||||||
|
|
||||||
Your Workflow should look similar to this example.
|
Your Workflow should look similar to this example.
|
||||||
@@ -39,7 +39,7 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.head_ref }}
|
ref: ${{ github.head_ref }}
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ jobs:
|
|||||||
# …
|
# …
|
||||||
|
|
||||||
# Commit all changed files back to the repository
|
# Commit all changed files back to the repository
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
```
|
```
|
||||||
|
|
||||||
> [!NOTE]
|
> [!NOTE]
|
||||||
@@ -56,7 +56,7 @@ jobs:
|
|||||||
The following is an extended example with all available options.
|
The following is an extended example with all available options.
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
with:
|
with:
|
||||||
# Optional. Commit message for the created commit.
|
# Optional. Commit message for the created commit.
|
||||||
# Defaults to "Apply automatic changes"
|
# Defaults to "Apply automatic changes"
|
||||||
@@ -85,10 +85,15 @@ The following is an extended example with all available options.
|
|||||||
commit_user_name: My GitHub Actions Bot # defaults to "github-actions[bot]"
|
commit_user_name: My GitHub Actions Bot # defaults to "github-actions[bot]"
|
||||||
commit_user_email: my-github-actions-bot@example.org # defaults to "41898282+github-actions[bot]@users.noreply.github.com"
|
commit_user_email: my-github-actions-bot@example.org # defaults to "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
commit_author: Author <actions@github.com> # defaults to "username <numeric_id+username@users.noreply.github.com>", where "numeric_id" and "username" belong to the author of the commit that triggered the run
|
commit_author: Author <actions@github.com> # defaults to "username <numeric_id+username@users.noreply.github.com>", where "numeric_id" and "username" belong to the author of the commit that triggered the run
|
||||||
|
|
||||||
|
# Optional. Tag name to be created in the local repository and
|
||||||
|
# pushed to the remote repository on the defined branch.
|
||||||
|
# If only one of `tag_name` or `tagging_message` is provided, the value of the provided field will be used for both tag name and message.
|
||||||
|
tag_name: 'v1.0.0'
|
||||||
|
|
||||||
# Optional. Tag name being created in the local repository and
|
# Optional. Message to annotate the created tag with.
|
||||||
# pushed to remote repository and defined branch.
|
# If only one of `tag_name` or `tagging_message` is provided, the value of the provided field will be used for both tag name and message.
|
||||||
tagging_message: 'v1.0.0'
|
tagging_message: 'Codename "Sunshine"'
|
||||||
|
|
||||||
# Optional. Option used by `git-status` to determine if the repository is
|
# Optional. Option used by `git-status` to determine if the repository is
|
||||||
# dirty. See https://git-scm.com/docs/git-status#_options
|
# dirty. See https://git-scm.com/docs/git-status#_options
|
||||||
@@ -105,12 +110,24 @@ The following is an extended example with all available options.
|
|||||||
# Optional. Disable dirty check and always try to create a commit and push
|
# Optional. Disable dirty check and always try to create a commit and push
|
||||||
skip_dirty_check: true
|
skip_dirty_check: true
|
||||||
|
|
||||||
|
# Optional. Skip internal call to `git fetch`
|
||||||
|
skip_fetch: true
|
||||||
|
|
||||||
|
# Optional. Skip internal call to `git checkout`
|
||||||
|
skip_checkout: true
|
||||||
|
|
||||||
|
# Optional. Skip internal call to `git push`
|
||||||
|
skip_push: true
|
||||||
|
|
||||||
# Optional. Prevents the shell from expanding filenames.
|
# Optional. Prevents the shell from expanding filenames.
|
||||||
# Details: https://www.gnu.org/software/bash/manual/html_node/Filename-Expansion.html
|
# Details: https://www.gnu.org/software/bash/manual/html_node/Filename-Expansion.html
|
||||||
disable_globbing: true
|
disable_globbing: true
|
||||||
|
|
||||||
|
# Optional. Create given branch name in local and remote repository.
|
||||||
|
create_branch: true
|
||||||
|
|
||||||
# Optional. Creates a new tag and pushes it to remote without creating a commit.
|
# Optional. Creates a new tag and pushes it to remote without creating a commit.
|
||||||
# Skips dirty check and changed files. Must be used with `tagging_message`.
|
# Skips dirty check and changed files. Must be used in combination with `tag` and `tagging_message`.
|
||||||
create_git_tag_only: false
|
create_git_tag_only: false
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -141,14 +158,14 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.head_ref }}
|
ref: ${{ github.head_ref }}
|
||||||
|
|
||||||
- name: Run php-cs-fixer
|
- name: Run php-cs-fixer
|
||||||
uses: docker://oskarstark/php-cs-fixer-ga
|
uses: docker://oskarstark/php-cs-fixer-ga
|
||||||
|
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
with:
|
with:
|
||||||
commit_message: Apply php-cs-fixer changes
|
commit_message: Apply php-cs-fixer changes
|
||||||
```
|
```
|
||||||
@@ -170,7 +187,7 @@ You can use these outputs to trigger other Actions in your Workflow run based on
|
|||||||
### Example
|
### Example
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
id: auto-commit-action #mandatory for the output to show up in ${{ steps }}
|
id: auto-commit-action #mandatory for the output to show up in ${{ steps }}
|
||||||
with:
|
with:
|
||||||
commit_message: Apply php-cs-fixer changes
|
commit_message: Apply php-cs-fixer changes
|
||||||
@@ -202,11 +219,11 @@ If this Action doesn't work for your workflow, check out [EndBug/add-and-commit]
|
|||||||
|
|
||||||
### Checkout the correct branch
|
### Checkout the correct branch
|
||||||
|
|
||||||
You must use `action/checkout@v2` or later versions to check out the repository.
|
You must use `actions/checkout@v2` or later versions to check out the repository.
|
||||||
In non-`push` events, such as `pull_request`, make sure to specify the `ref` to check out:
|
In non-`push` events, such as `pull_request`, make sure to specify the `ref` to check out:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
ref: ${{ github.head_ref }}
|
ref: ${{ github.head_ref }}
|
||||||
```
|
```
|
||||||
@@ -224,7 +241,7 @@ You can change this by creating a new [Personal Access Token (PAT)](https://gith
|
|||||||
storing the token as a secret in your repository and then passing the new token to the [`actions/checkout`](https://github.com/actions/checkout#usage) Action step.
|
storing the token as a secret in your repository and then passing the new token to the [`actions/checkout`](https://github.com/actions/checkout#usage) Action step.
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.PAT }}
|
token: ${{ secrets.PAT }}
|
||||||
```
|
```
|
||||||
@@ -270,7 +287,7 @@ The example below can be used as a starting point to generate a multiline commit
|
|||||||
# Quick and dirty step to get rid of the temporary file holding the commit message
|
# Quick and dirty step to get rid of the temporary file holding the commit message
|
||||||
- run: rm -rf commitmessage.txt
|
- run: rm -rf commitmessage.txt
|
||||||
|
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
id: commit
|
id: commit
|
||||||
with:
|
with:
|
||||||
commit_message: ${{ steps.commit_message_step.outputs.commit_message }}
|
commit_message: ${{ steps.commit_message_step.outputs.commit_message }}
|
||||||
@@ -294,7 +311,7 @@ As git-auto-commit by default does not use **your** username and email when crea
|
|||||||
git_commit_gpgsign: true
|
git_commit_gpgsign: true
|
||||||
|
|
||||||
- name: "Commit and push changes"
|
- name: "Commit and push changes"
|
||||||
uses: stefanzweifel/git-auto-commit-action@v5
|
uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
with:
|
with:
|
||||||
commit_author: "${{ steps.import-gpg.outputs.name }} <${{ steps.import-gpg.outputs.email }}>"
|
commit_author: "${{ steps.import-gpg.outputs.name }} <${{ steps.import-gpg.outputs.email }}>"
|
||||||
commit_user_name: ${{ steps.import-gpg.outputs.name }}
|
commit_user_name: ${{ steps.import-gpg.outputs.name }}
|
||||||
@@ -357,7 +374,7 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
# Checkout the fork/head-repository and push changes to the fork.
|
# Checkout the fork/head-repository and push changes to the fork.
|
||||||
# If you skip this, the base repository will be checked out and changes
|
# If you skip this, the base repository will be checked out and changes
|
||||||
@@ -371,7 +388,7 @@ jobs:
|
|||||||
- name: Run php-cs-fixer
|
- name: Run php-cs-fixer
|
||||||
uses: docker://oskarstark/php-cs-fixer-ga
|
uses: docker://oskarstark/php-cs-fixer-ga
|
||||||
|
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
```
|
```
|
||||||
|
|
||||||
For more information about running Actions on forks, see [this announcement from GitHub](https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/).
|
For more information about running Actions on forks, see [this announcement from GitHub](https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/).
|
||||||
@@ -406,12 +423,13 @@ The steps in your workflow might look like this:
|
|||||||
echo "message=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
|
echo "message=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
|
||||||
echo "author=$(git log -1 --pretty=\"%an <%ae>\")" >> $GITHUB_OUTPUT
|
echo "author=$(git log -1 --pretty=\"%an <%ae>\")" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
with:
|
with:
|
||||||
commit_author: ${{ steps.last-commit.outputs.author }}
|
commit_author: ${{ steps.last-commit.outputs.author }}
|
||||||
commit_message: ${{ steps.last-commit.outputs.message }}
|
commit_message: ${{ steps.last-commit.outputs.message }}
|
||||||
commit_options: '--amend --no-edit'
|
commit_options: '--amend --no-edit'
|
||||||
push_options: '--force'
|
push_options: '--force'
|
||||||
|
skip_fetch: true
|
||||||
```
|
```
|
||||||
|
|
||||||
See discussion in [#159](https://github.com/stefanzweifel/git-auto-commit-action/issues/159#issuecomment-845347950) for details.
|
See discussion in [#159](https://github.com/stefanzweifel/git-auto-commit-action/issues/159#issuecomment-845347950) for details.
|
||||||
@@ -448,7 +466,7 @@ If you create a personal access token (classic), apply the `repo` and `workflow`
|
|||||||
If you create a fine-grained personal access token, apply the `Contents`-permissions.
|
If you create a fine-grained personal access token, apply the `Contents`-permissions.
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
# We pass the "PAT" secret to the checkout action; if no PAT secret is available to the workflow runner (eg. Dependabot) we fall back to the default "GITHUB_TOKEN".
|
# We pass the "PAT" secret to the checkout action; if no PAT secret is available to the workflow runner (eg. Dependabot) we fall back to the default "GITHUB_TOKEN".
|
||||||
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
||||||
@@ -462,7 +480,7 @@ You can learn more about Personal Access Token in the [GitHub documentation](htt
|
|||||||
If you go the "force pushes" route, you have to enable force pushes to a protected branch (see [documentation](https://help.github.com/en/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch)) and update your Workflow to use force push like this.
|
If you go the "force pushes" route, you have to enable force pushes to a protected branch (see [documentation](https://help.github.com/en/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch)) and update your Workflow to use force push like this.
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
with:
|
with:
|
||||||
commit_message: Apply php-cs-fixer changes
|
commit_message: Apply php-cs-fixer changes
|
||||||
push_options: --force
|
push_options: --force
|
||||||
@@ -492,7 +510,7 @@ This is due to the fact, that the `*.md`-glob is expanded before sending it to `
|
|||||||
To fix this add `disable_globbing: true` to your Workflow.
|
To fix this add `disable_globbing: true` to your Workflow.
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v5
|
- uses: stefanzweifel/git-auto-commit-action@v7
|
||||||
with:
|
with:
|
||||||
file_pattern: '*.md'
|
file_pattern: '*.md'
|
||||||
disable_globbing: true
|
disable_globbing: true
|
||||||
@@ -520,7 +538,7 @@ yarn test
|
|||||||
|
|
||||||
We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/stefanzweifel/git-auto-commit-action/tags).
|
We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/stefanzweifel/git-auto-commit-action/tags).
|
||||||
|
|
||||||
We also provide major version tags to make it easier to always use the latest release of a major version. For example, you can use `stefanzweifel/git-auto-commit-action@v5` to always use the latest release of the current major version.
|
We also provide major version tags to make it easier to always use the latest release of a major version. For example, you can use `stefanzweifel/git-auto-commit-action@v7` to always use the latest release of the current major version.
|
||||||
(More information about this [here](https://help.github.com/en/actions/building-actions/about-actions#versioning-your-action).)
|
(More information about this [here](https://help.github.com/en/actions/building-actions/about-actions#versioning-your-action).)
|
||||||
|
|
||||||
## Credits
|
## Credits
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
# Upgrading
|
# Upgrading
|
||||||
|
|
||||||
|
## From v6 to v7
|
||||||
|
|
||||||
|
The previously removed options `create_branch`, `skip_fetch`, and `skip_checkout` have been reintroduced in git-auto-commit v7. If you had removed these options from your workflows when upgrading to v6, you can now add them back if needed.
|
||||||
|
|
||||||
|
Tagging a commit has been reworked. In addition to the existing `tagging_message`-option, a new `tag_name` option has been added. If you were using `tagging_message`, you can continue to do so, but if you want to specify a custom tag name and tag message, you can now use the `tag_name` and `tagging_message` option.
|
||||||
|
(Specifying a `tagging_message` without a `tag_name` will create a tag with the name and message both set to the value of `tagging_message`.)
|
||||||
|
|
||||||
## From v5 to v6
|
## From v5 to v6
|
||||||
|
|
||||||
The following options have been removed from git-auto-commit and can be removed from your workflows.
|
The following options have been removed from git-auto-commit and can be removed from your workflows.
|
||||||
|
|||||||
34
action.yml
34
action.yml
@@ -44,8 +44,12 @@ inputs:
|
|||||||
description: Value used for the commit author. Defaults to the username of whoever triggered this workflow run.
|
description: Value used for the commit author. Defaults to the username of whoever triggered this workflow run.
|
||||||
required: false
|
required: false
|
||||||
default: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
|
default: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
|
||||||
|
tag_name:
|
||||||
|
description: Tag name used for creating a new git tag with the commit. Keep this empty, if no tag should be created.
|
||||||
|
required: false
|
||||||
|
default: ''
|
||||||
tagging_message:
|
tagging_message:
|
||||||
description: Message used to create a new git tag with the commit. Keep this empty, if no tag should be created.
|
description: Tagging message used for creating a new git tag with the commit. Keep this empty, if no tag should be created.
|
||||||
required: false
|
required: false
|
||||||
default: ''
|
default: ''
|
||||||
push_options:
|
push_options:
|
||||||
@@ -56,9 +60,24 @@ inputs:
|
|||||||
description: Skip the check if the git repository is dirty and always try to create a commit.
|
description: Skip the check if the git repository is dirty and always try to create a commit.
|
||||||
required: false
|
required: false
|
||||||
default: false
|
default: false
|
||||||
|
skip_fetch:
|
||||||
|
description: Skip the call to git-fetch.
|
||||||
|
required: false
|
||||||
|
default: false
|
||||||
|
skip_checkout:
|
||||||
|
description: Skip the call to git-checkout.
|
||||||
|
required: false
|
||||||
|
default: false
|
||||||
|
skip_push:
|
||||||
|
description: Skip the call to git-push.
|
||||||
|
required: false
|
||||||
|
default: false
|
||||||
disable_globbing:
|
disable_globbing:
|
||||||
description: Stop the shell from expanding filenames (https://www.gnu.org/software/bash/manual/html_node/Filename-Expansion.html)
|
description: Stop the shell from expanding filenames (https://www.gnu.org/software/bash/manual/html_node/Filename-Expansion.html)
|
||||||
default: false
|
default: false
|
||||||
|
create_branch:
|
||||||
|
description: Create new branch with the name of `branch`-input in local and remote repository, if it doesn't exist yet.
|
||||||
|
default: false
|
||||||
create_git_tag_only:
|
create_git_tag_only:
|
||||||
description: Perform a clean git tag and push, without commiting anything
|
description: Perform a clean git tag and push, without commiting anything
|
||||||
required: false
|
required: false
|
||||||
@@ -66,17 +85,6 @@ inputs:
|
|||||||
internal_git_binary:
|
internal_git_binary:
|
||||||
description: Internal use only! Path to git binary used to check if git is available. (Don't change this!)
|
description: Internal use only! Path to git binary used to check if git is available. (Don't change this!)
|
||||||
default: git
|
default: git
|
||||||
skip_fetch:
|
|
||||||
description: "Deprecated: skip_fetch has been removed in v6. It does not have any effect anymore."
|
|
||||||
required: false
|
|
||||||
default: false
|
|
||||||
skip_checkout:
|
|
||||||
description: "Deprecated: skip_checkout has been removed in v6. It does not have any effect anymore."
|
|
||||||
required: false
|
|
||||||
default: false
|
|
||||||
create_branch:
|
|
||||||
description: "Deprecated: create_branch has been removed in v6. It does not have any effect anymore."
|
|
||||||
default: false
|
|
||||||
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
@@ -88,7 +96,7 @@ outputs:
|
|||||||
description: Value is "true", if a git tag was created using the `create_git_tag_only`-input.
|
description: Value is "true", if a git tag was created using the `create_git_tag_only`-input.
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: 'node20'
|
using: 'node24'
|
||||||
main: 'index.js'
|
main: 'index.js'
|
||||||
|
|
||||||
branding:
|
branding:
|
||||||
|
|||||||
@@ -27,25 +27,13 @@ _log() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_main() {
|
_main() {
|
||||||
if "$INPUT_SKIP_FETCH"; then
|
|
||||||
_log "warning" "git-auto-commit: skip_fetch has been removed in v6. It does not have any effect anymore.";
|
|
||||||
fi
|
|
||||||
|
|
||||||
if "$INPUT_SKIP_CHECKOUT"; then
|
|
||||||
_log "warning" "git-auto-commit: skip_checkout has been removed in v6. It does not have any effect anymore.";
|
|
||||||
fi
|
|
||||||
|
|
||||||
if "$INPUT_CREATE_BRANCH"; then
|
|
||||||
_log "warning" "git-auto-commit: create_branch has been removed in v6. It does not have any effect anymore.";
|
|
||||||
fi
|
|
||||||
|
|
||||||
_check_if_git_is_available
|
_check_if_git_is_available
|
||||||
|
|
||||||
_switch_to_repository
|
_switch_to_repository
|
||||||
|
|
||||||
_check_if_is_git_repository
|
_check_if_is_git_repository
|
||||||
|
|
||||||
# _check_if_repository_is_in_detached_state
|
_check_if_repository_is_in_detached_state
|
||||||
|
|
||||||
if "$INPUT_CREATE_GIT_TAG_ONLY"; then
|
if "$INPUT_CREATE_GIT_TAG_ONLY"; then
|
||||||
_log "debug" "Create git tag only";
|
_log "debug" "Create git tag only";
|
||||||
@@ -56,6 +44,8 @@ _main() {
|
|||||||
|
|
||||||
_set_github_output "changes_detected" "true"
|
_set_github_output "changes_detected" "true"
|
||||||
|
|
||||||
|
_switch_to_branch
|
||||||
|
|
||||||
_add_files
|
_add_files
|
||||||
|
|
||||||
# Check dirty state of repo again using git-diff.
|
# Check dirty state of repo again using git-diff.
|
||||||
@@ -120,13 +110,40 @@ _check_if_is_git_repository() {
|
|||||||
_check_if_repository_is_in_detached_state() {
|
_check_if_repository_is_in_detached_state() {
|
||||||
if [ -z "$(git symbolic-ref HEAD)" ]
|
if [ -z "$(git symbolic-ref HEAD)" ]
|
||||||
then
|
then
|
||||||
_log "error" "Repository is in detached HEAD state. Please make sure you check out a branch. Adjust the `ref` input accordingly.";
|
_log "warning" "Repository is in a detached HEAD state. git-auto-commit will likely handle this automatically. To avoid it, check out a branch using the ref option in actions/checkout.";
|
||||||
exit 1;
|
|
||||||
else
|
else
|
||||||
_log "debug" "Repository is on a branch.";
|
_log "debug" "Repository is on a branch.";
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_switch_to_branch() {
|
||||||
|
echo "INPUT_BRANCH value: $INPUT_BRANCH";
|
||||||
|
|
||||||
|
# Fetch remote to make sure that repo can be switched to the right branch.
|
||||||
|
if "$INPUT_SKIP_FETCH"; then
|
||||||
|
_log "debug" "git-fetch will not be executed.";
|
||||||
|
else
|
||||||
|
_log "debug" "git-fetch will be executed.";
|
||||||
|
git fetch --depth=1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If `skip_checkout`-input is true, skip the entire checkout step.
|
||||||
|
if "$INPUT_SKIP_CHECKOUT"; then
|
||||||
|
_log "debug" "git-checkout will not be executed.";
|
||||||
|
else
|
||||||
|
_log "debug" "git-checkout will be executed.";
|
||||||
|
# Create new local branch if `create_branch`-input is true
|
||||||
|
if "$INPUT_CREATE_BRANCH"; then
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
git checkout -B $INPUT_BRANCH --;
|
||||||
|
else
|
||||||
|
# Switch to branch from current Workflow run
|
||||||
|
# shellcheck disable=SC2086
|
||||||
|
git checkout $INPUT_BRANCH --;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
_add_files() {
|
_add_files() {
|
||||||
echo "INPUT_ADD_OPTIONS: ${INPUT_ADD_OPTIONS}";
|
echo "INPUT_ADD_OPTIONS: ${INPUT_ADD_OPTIONS}";
|
||||||
_log "debug" "Apply add options ${INPUT_ADD_OPTIONS}";
|
_log "debug" "Apply add options ${INPUT_ADD_OPTIONS}";
|
||||||
@@ -159,18 +176,25 @@ _local_commit() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_tag_commit() {
|
_tag_commit() {
|
||||||
|
echo "INPUT_TAG_NAME: ${INPUT_TAG_NAME}"
|
||||||
echo "INPUT_TAGGING_MESSAGE: ${INPUT_TAGGING_MESSAGE}"
|
echo "INPUT_TAGGING_MESSAGE: ${INPUT_TAGGING_MESSAGE}"
|
||||||
|
|
||||||
if [ -n "$INPUT_TAGGING_MESSAGE" ]
|
if [ -n "$INPUT_TAG_NAME" ] || [ -n "$INPUT_TAGGING_MESSAGE" ]; then
|
||||||
then
|
INTERNAL_TAG=${INPUT_TAG_NAME:-$INPUT_TAGGING_MESSAGE}
|
||||||
_log "debug" "Create tag $INPUT_TAGGING_MESSAGE";
|
INTERNAL_TAGGING_MESSAGE=${INPUT_TAGGING_MESSAGE:-$INPUT_TAG_NAME}
|
||||||
git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" tag -a "$INPUT_TAGGING_MESSAGE" -m "$INPUT_TAGGING_MESSAGE";
|
|
||||||
|
_log "debug" "Create tag $INTERNAL_TAG: $INTERNAL_TAGGING_MESSAGE"
|
||||||
|
git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" tag -a "$INTERNAL_TAG" -m "$INTERNAL_TAGGING_MESSAGE"
|
||||||
else
|
else
|
||||||
echo "No tagging message supplied. No tag will be added.";
|
echo "Neither tag nor tag message is set. No tag will be added.";
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
_push_to_github() {
|
_push_to_github() {
|
||||||
|
if "$INPUT_SKIP_PUSH"; then
|
||||||
|
_log "debug" "git-push will not be executed.";
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
echo "INPUT_BRANCH value: $INPUT_BRANCH";
|
echo "INPUT_BRANCH value: $INPUT_BRANCH";
|
||||||
|
|
||||||
@@ -182,8 +206,8 @@ _push_to_github() {
|
|||||||
|
|
||||||
if [ -z "$INPUT_BRANCH" ]
|
if [ -z "$INPUT_BRANCH" ]
|
||||||
then
|
then
|
||||||
# Only add `--tags` option, if `$INPUT_TAGGING_MESSAGE` is set
|
# Only add `--tags` option, if `$INPUT_TAG_NAME` or `$INPUT_TAGGING_MESSAGE` is set
|
||||||
if [ -n "$INPUT_TAGGING_MESSAGE" ]
|
if [ -n "$INPUT_TAG_NAME" ] || [ -n "$INPUT_TAGGING_MESSAGE" ]
|
||||||
then
|
then
|
||||||
_log "debug" "git push origin --tags";
|
_log "debug" "git push origin --tags";
|
||||||
git push origin --follow-tags --atomic ${INPUT_PUSH_OPTIONS:+"${INPUT_PUSH_OPTIONS_ARRAY[@]}"};
|
git push origin --follow-tags --atomic ${INPUT_PUSH_OPTIONS:+"${INPUT_PUSH_OPTIONS_ARRAY[@]}"};
|
||||||
|
|||||||
8
package-lock.json
generated
8
package-lock.json
generated
@@ -5,15 +5,15 @@
|
|||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"bats": "^1.12.0",
|
"bats": "^1.13.0",
|
||||||
"bats-assert": "ztombol/bats-assert",
|
"bats-assert": "ztombol/bats-assert",
|
||||||
"bats-support": "ztombol/bats-support"
|
"bats-support": "ztombol/bats-support"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/bats": {
|
"node_modules/bats": {
|
||||||
"version": "1.12.0",
|
"version": "1.13.0",
|
||||||
"resolved": "https://registry.npmjs.org/bats/-/bats-1.12.0.tgz",
|
"resolved": "https://registry.npmjs.org/bats/-/bats-1.13.0.tgz",
|
||||||
"integrity": "sha512-1HTv2n+fjn3bmY9SNDgmzS6bjoKtVlSK2pIHON5aSA2xaqGkZFoCCWP46/G6jm9zZ7MCi84mD+3Byw4t3KGwBg==",
|
"integrity": "sha512-giSYKGTOcPZyJDbfbTtzAedLcNWdjCLbXYU3/MwPnjyvDXzu6Dgw8d2M+8jHhZXSmsCMSQqCp+YBsJ603UO4vQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"bats": "^1.12.0",
|
"bats": "^1.13.0",
|
||||||
"bats-assert": "ztombol/bats-assert",
|
"bats-assert": "ztombol/bats-assert",
|
||||||
"bats-support": "ztombol/bats-support"
|
"bats-support": "ztombol/bats-support"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -32,16 +32,16 @@ setup() {
|
|||||||
export INPUT_COMMIT_USER_NAME="Test Suite"
|
export INPUT_COMMIT_USER_NAME="Test Suite"
|
||||||
export INPUT_COMMIT_USER_EMAIL="test@github.com"
|
export INPUT_COMMIT_USER_EMAIL="test@github.com"
|
||||||
export INPUT_COMMIT_AUTHOR="Test Suite <test@users.noreply.github.com>"
|
export INPUT_COMMIT_AUTHOR="Test Suite <test@users.noreply.github.com>"
|
||||||
|
export INPUT_TAG_NAME=""
|
||||||
export INPUT_TAGGING_MESSAGE=""
|
export INPUT_TAGGING_MESSAGE=""
|
||||||
export INPUT_PUSH_OPTIONS=""
|
export INPUT_PUSH_OPTIONS=""
|
||||||
export INPUT_SKIP_DIRTY_CHECK=false
|
export INPUT_SKIP_DIRTY_CHECK=false
|
||||||
export INPUT_DISABLE_GLOBBING=false
|
|
||||||
export INPUT_INTERNAL_GIT_BINARY=git
|
|
||||||
|
|
||||||
# Deprecated variables. Will be removed in future versions
|
|
||||||
export INPUT_CREATE_BRANCH=false
|
|
||||||
export INPUT_SKIP_FETCH=false
|
export INPUT_SKIP_FETCH=false
|
||||||
export INPUT_SKIP_CHECKOUT=false
|
export INPUT_SKIP_CHECKOUT=false
|
||||||
|
export INPUT_SKIP_PUSH=false
|
||||||
|
export INPUT_DISABLE_GLOBBING=false
|
||||||
|
export INPUT_CREATE_BRANCH=false
|
||||||
|
export INPUT_INTERNAL_GIT_BINARY=git
|
||||||
|
|
||||||
# Set GitHub environment variables used by the GitHub Action
|
# Set GitHub environment variables used by the GitHub Action
|
||||||
temp_github_output_file=$(mktemp -t github_output_test.XXXXX)
|
temp_github_output_file=$(mktemp -t github_output_test.XXXXX)
|
||||||
@@ -123,8 +123,9 @@ cat_github_output() {
|
|||||||
assert_line "INPUT_FILE_PATTERN: ."
|
assert_line "INPUT_FILE_PATTERN: ."
|
||||||
assert_line "INPUT_COMMIT_OPTIONS: "
|
assert_line "INPUT_COMMIT_OPTIONS: "
|
||||||
assert_line "::debug::Apply commit options "
|
assert_line "::debug::Apply commit options "
|
||||||
|
assert_line "INPUT_TAG_NAME: "
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: "
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
assert_line "No tagging message supplied. No tag will be added."
|
assert_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
assert_line "INPUT_PUSH_OPTIONS: "
|
assert_line "INPUT_PUSH_OPTIONS: "
|
||||||
assert_line "::debug::Apply push options "
|
assert_line "::debug::Apply push options "
|
||||||
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
||||||
@@ -146,8 +147,9 @@ cat_github_output() {
|
|||||||
assert_line "INPUT_FILE_PATTERN: ."
|
assert_line "INPUT_FILE_PATTERN: ."
|
||||||
assert_line "INPUT_COMMIT_OPTIONS: "
|
assert_line "INPUT_COMMIT_OPTIONS: "
|
||||||
assert_line "::debug::Apply commit options "
|
assert_line "::debug::Apply commit options "
|
||||||
|
assert_line "INPUT_TAG_NAME: "
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: "
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
assert_line "No tagging message supplied. No tag will be added."
|
assert_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
assert_line "INPUT_PUSH_OPTIONS: "
|
assert_line "INPUT_PUSH_OPTIONS: "
|
||||||
assert_line "::debug::Apply push options "
|
assert_line "::debug::Apply push options "
|
||||||
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
||||||
@@ -293,7 +295,8 @@ cat_github_output() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@test "It creates a tag with the commit" {
|
@test "It creates a tag with the commit" {
|
||||||
INPUT_TAGGING_MESSAGE="v1.0.0"
|
INPUT_TAG_NAME="v1.0.0"
|
||||||
|
INPUT_TAGGING_MESSAGE="MyProduct v1.0.0"
|
||||||
|
|
||||||
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
@@ -301,13 +304,15 @@ cat_github_output() {
|
|||||||
|
|
||||||
assert_success
|
assert_success
|
||||||
|
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: v1.0.0"
|
assert_line "INPUT_TAG_NAME: v1.0.0"
|
||||||
assert_line "::debug::Create tag v1.0.0"
|
assert_line "INPUT_TAGGING_MESSAGE: MyProduct v1.0.0"
|
||||||
|
|
||||||
|
assert_line "::debug::Create tag v1.0.0: MyProduct v1.0.0"
|
||||||
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
||||||
|
|
||||||
# Assert a tag v1.0.0 has been created
|
# Assert a tag v1.0.0 has been created
|
||||||
run git tag
|
run git tag -n
|
||||||
assert_output v1.0.0
|
assert_output 'v1.0.0 MyProduct v1.0.0'
|
||||||
|
|
||||||
run git ls-remote --tags --refs
|
run git ls-remote --tags --refs
|
||||||
assert_output --partial refs/tags/v1.0.0
|
assert_output --partial refs/tags/v1.0.0
|
||||||
@@ -348,6 +353,24 @@ cat_github_output() {
|
|||||||
assert_equal $current_sha $remote_sha
|
assert_equal $current_sha $remote_sha
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "If SKIP_PUSH is true git-push will not be called" {
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
INPUT_SKIP_PUSH=true
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
assert_line "::debug::git-push will not be executed."
|
||||||
|
|
||||||
|
# Assert that the sha values are not equal on local and remote
|
||||||
|
current_sha="$(git rev-parse --verify --short ${FAKE_DEFAULT_BRANCH})"
|
||||||
|
remote_sha="$(git rev-parse --verify --short origin/${FAKE_DEFAULT_BRANCH})"
|
||||||
|
|
||||||
|
refute [assert_equal $current_sha $remote_sha]
|
||||||
|
}
|
||||||
|
|
||||||
@test "It can checkout a different branch" {
|
@test "It can checkout a different branch" {
|
||||||
# Create foo-branch and then immediately switch back to ${FAKE_DEFAULT_BRANCH}
|
# Create foo-branch and then immediately switch back to ${FAKE_DEFAULT_BRANCH}
|
||||||
git checkout -b foo
|
git checkout -b foo
|
||||||
@@ -388,9 +411,11 @@ cat_github_output() {
|
|||||||
assert_equal $current_sha $remote_sha
|
assert_equal $current_sha $remote_sha
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "It uses existing branch when INPUT_BRANCH is empty and INPUT_TAGGING_MESSAGE is set" {
|
@test "It uses existing branch when INPUT_BRANCH is empty and INPUT_TAG is set" {
|
||||||
INPUT_BRANCH=""
|
INPUT_BRANCH=""
|
||||||
INPUT_TAGGING_MESSAGE="v2.0.0"
|
INPUT_TAG_NAME="v2.0.0"
|
||||||
|
INPUT_TAGGING_MESSAGE="MyProduct v2.0.0"
|
||||||
|
|
||||||
|
|
||||||
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
@@ -398,8 +423,8 @@ cat_github_output() {
|
|||||||
|
|
||||||
assert_success
|
assert_success
|
||||||
|
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: v2.0.0"
|
assert_line "INPUT_TAG_NAME: v2.0.0"
|
||||||
assert_line "::debug::Create tag v2.0.0"
|
assert_line "::debug::Create tag v2.0.0: MyProduct v2.0.0"
|
||||||
assert_line "::debug::git push origin --tags"
|
assert_line "::debug::git push origin --tags"
|
||||||
|
|
||||||
# Assert a tag v2.0.0 has been created
|
# Assert a tag v2.0.0 has been created
|
||||||
@@ -411,9 +436,37 @@ cat_github_output() {
|
|||||||
assert_output --partial refs/tags/v2.0.0
|
assert_output --partial refs/tags/v2.0.0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "If SKIP_FETCH is true git-fetch will not be called" {
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
INPUT_SKIP_FETCH=true
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
assert_line "::debug::git-fetch will not be executed."
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "If SKIP_CHECKOUT is true git-checkout will not be called" {
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
INPUT_SKIP_CHECKOUT=true
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
assert_line "::debug::git-checkout will not be executed."
|
||||||
|
}
|
||||||
|
|
||||||
@test "It pushes generated commit and tag to remote and actually updates the commit shas" {
|
@test "It pushes generated commit and tag to remote and actually updates the commit shas" {
|
||||||
INPUT_BRANCH=""
|
INPUT_BRANCH=""
|
||||||
INPUT_TAGGING_MESSAGE="v2.0.0"
|
INPUT_TAG_NAME="v2.0.0"
|
||||||
|
INPUT_TAGGING_MESSAGE="MyProduct v2.0.0"
|
||||||
|
|
||||||
|
|
||||||
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
@@ -421,8 +474,8 @@ cat_github_output() {
|
|||||||
|
|
||||||
assert_success
|
assert_success
|
||||||
|
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: v2.0.0"
|
assert_line "INPUT_TAG_NAME: v2.0.0"
|
||||||
assert_line "::debug::Create tag v2.0.0"
|
assert_line "::debug::Create tag v2.0.0: MyProduct v2.0.0"
|
||||||
assert_line "::debug::git push origin --tags"
|
assert_line "::debug::git push origin --tags"
|
||||||
|
|
||||||
# Assert a tag v2.0.0 has been created
|
# Assert a tag v2.0.0 has been created
|
||||||
@@ -441,8 +494,14 @@ cat_github_output() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@test "It pushes generated commit and tag to remote branch and updates commit sha" {
|
@test "It pushes generated commit and tag to remote branch and updates commit sha" {
|
||||||
|
# Create "a-new-branch"-branch and then immediately switch back to ${FAKE_DEFAULT_BRANCH}
|
||||||
|
git checkout -b a-new-branch
|
||||||
|
git checkout ${FAKE_DEFAULT_BRANCH}
|
||||||
|
|
||||||
INPUT_BRANCH="a-new-branch"
|
INPUT_BRANCH="a-new-branch"
|
||||||
INPUT_TAGGING_MESSAGE="v2.0.0"
|
INPUT_TAG_NAME="v2.0.0"
|
||||||
|
INPUT_TAGGING_MESSAGE="MyProduct v2.0.0"
|
||||||
|
|
||||||
|
|
||||||
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
@@ -450,8 +509,8 @@ cat_github_output() {
|
|||||||
|
|
||||||
assert_success
|
assert_success
|
||||||
|
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: v2.0.0"
|
assert_line "INPUT_TAG_NAME: v2.0.0"
|
||||||
assert_line "::debug::Create tag v2.0.0"
|
assert_line "::debug::Create tag v2.0.0: MyProduct v2.0.0"
|
||||||
assert_line "::debug::Push commit to remote branch a-new-branch"
|
assert_line "::debug::Push commit to remote branch a-new-branch"
|
||||||
|
|
||||||
# Assert a tag v2.0.0 has been created
|
# Assert a tag v2.0.0 has been created
|
||||||
@@ -463,7 +522,7 @@ cat_github_output() {
|
|||||||
assert_output --partial refs/tags/v2.0.0
|
assert_output --partial refs/tags/v2.0.0
|
||||||
|
|
||||||
# Assert that branch "a-new-branch" was updated on remote
|
# Assert that branch "a-new-branch" was updated on remote
|
||||||
current_sha="$(git rev-parse --verify --short ${FAKE_DEFAULT_BRANCH})"
|
current_sha="$(git rev-parse --verify --short a-new-branch)"
|
||||||
remote_sha="$(git rev-parse --verify --short origin/a-new-branch)"
|
remote_sha="$(git rev-parse --verify --short origin/a-new-branch)"
|
||||||
|
|
||||||
assert_equal $current_sha $remote_sha
|
assert_equal $current_sha $remote_sha
|
||||||
@@ -507,6 +566,7 @@ cat_github_output() {
|
|||||||
@test "it does not throw an error if not changes are detected and SKIP_DIRTY_CHECK is false" {
|
@test "it does not throw an error if not changes are detected and SKIP_DIRTY_CHECK is false" {
|
||||||
INPUT_FILE_PATTERN="."
|
INPUT_FILE_PATTERN="."
|
||||||
INPUT_SKIP_DIRTY_CHECK=false
|
INPUT_SKIP_DIRTY_CHECK=false
|
||||||
|
INPUT_SKIP_FETCH=false
|
||||||
|
|
||||||
run git_auto_commit
|
run git_auto_commit
|
||||||
|
|
||||||
@@ -560,6 +620,8 @@ cat_github_output() {
|
|||||||
|
|
||||||
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
INPUT_SKIP_CHECKOUT=true
|
||||||
|
|
||||||
run git_auto_commit
|
run git_auto_commit
|
||||||
|
|
||||||
assert_success
|
assert_success
|
||||||
@@ -589,6 +651,8 @@ cat_github_output() {
|
|||||||
|
|
||||||
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
INPUT_SKIP_CHECKOUT=true
|
||||||
|
|
||||||
run git_auto_commit
|
run git_auto_commit
|
||||||
|
|
||||||
assert_success
|
assert_success
|
||||||
@@ -598,8 +662,9 @@ cat_github_output() {
|
|||||||
assert_line "INPUT_FILE_PATTERN: ."
|
assert_line "INPUT_FILE_PATTERN: ."
|
||||||
assert_line "INPUT_COMMIT_OPTIONS: "
|
assert_line "INPUT_COMMIT_OPTIONS: "
|
||||||
assert_line "::debug::Apply commit options "
|
assert_line "::debug::Apply commit options "
|
||||||
|
assert_line "INPUT_TAG_NAME: "
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: "
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
assert_line "No tagging message supplied. No tag will be added."
|
assert_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
assert_line "INPUT_PUSH_OPTIONS: "
|
assert_line "INPUT_PUSH_OPTIONS: "
|
||||||
assert_line "::debug::Apply push options "
|
assert_line "::debug::Apply push options "
|
||||||
assert_line "::debug::Push commit to remote branch not-existend-branch"
|
assert_line "::debug::Push commit to remote branch not-existend-branch"
|
||||||
@@ -618,51 +683,6 @@ cat_github_output() {
|
|||||||
assert_line -e "commit_hash=[0-9a-f]{40}$"
|
assert_line -e "commit_hash=[0-9a-f]{40}$"
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "It does not create new local branch if local branch already exists" {
|
|
||||||
git checkout -b not-existend-remote-branch
|
|
||||||
git checkout ${FAKE_DEFAULT_BRANCH}
|
|
||||||
|
|
||||||
INPUT_BRANCH="not-existend-remote-branch"
|
|
||||||
|
|
||||||
run git branch
|
|
||||||
assert_line --partial "not-existend-remote-branch"
|
|
||||||
|
|
||||||
run git branch -r
|
|
||||||
refute_line --partial "origin/not-existend-remote-branch"
|
|
||||||
|
|
||||||
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
|
||||||
|
|
||||||
run git_auto_commit
|
|
||||||
|
|
||||||
assert_success
|
|
||||||
|
|
||||||
assert_line "INPUT_REPOSITORY value: ${INPUT_REPOSITORY}"
|
|
||||||
assert_line "INPUT_BRANCH value: not-existend-remote-branch"
|
|
||||||
assert_line "INPUT_FILE_PATTERN: ."
|
|
||||||
assert_line "INPUT_COMMIT_OPTIONS: "
|
|
||||||
assert_line "::debug::Apply commit options "
|
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: "
|
|
||||||
assert_line "No tagging message supplied. No tag will be added."
|
|
||||||
assert_line "INPUT_PUSH_OPTIONS: "
|
|
||||||
assert_line "::debug::Apply push options "
|
|
||||||
assert_line "::debug::Push commit to remote branch not-existend-remote-branch"
|
|
||||||
|
|
||||||
# Assert checked out branch is still the same.
|
|
||||||
run git rev-parse --abbrev-ref HEAD
|
|
||||||
assert_line --partial ${FAKE_DEFAULT_BRANCH}
|
|
||||||
refute_line --partial "not-existend-remote-branch"
|
|
||||||
|
|
||||||
run git branch
|
|
||||||
assert_line --partial "not-existend-remote-branch"
|
|
||||||
|
|
||||||
run git branch -r
|
|
||||||
assert_line --partial "origin/not-existend-remote-branch"
|
|
||||||
|
|
||||||
run cat_github_output
|
|
||||||
assert_line "changes_detected=true"
|
|
||||||
assert_line -e "commit_hash=[0-9a-f]{40}$"
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "It creates new local branch and pushes branch to remote even if the remote branch already exists" {
|
@test "It creates new local branch and pushes branch to remote even if the remote branch already exists" {
|
||||||
# Create `existing-remote-branch` on remote with changes the local repository does not yet have
|
# Create `existing-remote-branch` on remote with changes the local repository does not yet have
|
||||||
cd $FAKE_TEMP_LOCAL_REPOSITORY
|
cd $FAKE_TEMP_LOCAL_REPOSITORY
|
||||||
@@ -680,6 +700,7 @@ cat_github_output() {
|
|||||||
cd $FAKE_LOCAL_REPOSITORY
|
cd $FAKE_LOCAL_REPOSITORY
|
||||||
|
|
||||||
INPUT_BRANCH="existing-remote-branch"
|
INPUT_BRANCH="existing-remote-branch"
|
||||||
|
INPUT_SKIP_CHECKOUT=true
|
||||||
|
|
||||||
run git branch
|
run git branch
|
||||||
refute_line --partial "existing-remote-branch"
|
refute_line --partial "existing-remote-branch"
|
||||||
@@ -700,8 +721,9 @@ cat_github_output() {
|
|||||||
assert_line "INPUT_FILE_PATTERN: ."
|
assert_line "INPUT_FILE_PATTERN: ."
|
||||||
assert_line "INPUT_COMMIT_OPTIONS: "
|
assert_line "INPUT_COMMIT_OPTIONS: "
|
||||||
assert_line "::debug::Apply commit options "
|
assert_line "::debug::Apply commit options "
|
||||||
|
assert_line "INPUT_TAG_NAME: "
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: "
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
assert_line "No tagging message supplied. No tag will be added."
|
assert_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
assert_line "INPUT_PUSH_OPTIONS: "
|
assert_line "INPUT_PUSH_OPTIONS: "
|
||||||
assert_line "::debug::Apply push options "
|
assert_line "::debug::Apply push options "
|
||||||
assert_line "::debug::Push commit to remote branch existing-remote-branch"
|
assert_line "::debug::Push commit to remote branch existing-remote-branch"
|
||||||
@@ -724,7 +746,7 @@ cat_github_output() {
|
|||||||
assert_line -e "commit_hash=[0-9a-f]{40}$"
|
assert_line -e "commit_hash=[0-9a-f]{40}$"
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "It fails if local branch is behind remote and when remote has newer commits" {
|
@test "It fails if local branch is behind remote and when remote has newer commits and skip_checkout is set to true" {
|
||||||
# Create `existing-remote-branch` on remote with changes the local repository does not yet have
|
# Create `existing-remote-branch` on remote with changes the local repository does not yet have
|
||||||
cd $FAKE_TEMP_LOCAL_REPOSITORY
|
cd $FAKE_TEMP_LOCAL_REPOSITORY
|
||||||
git checkout -b "existing-remote-branch"
|
git checkout -b "existing-remote-branch"
|
||||||
@@ -741,6 +763,7 @@ cat_github_output() {
|
|||||||
cd $FAKE_LOCAL_REPOSITORY
|
cd $FAKE_LOCAL_REPOSITORY
|
||||||
|
|
||||||
INPUT_BRANCH="existing-remote-branch"
|
INPUT_BRANCH="existing-remote-branch"
|
||||||
|
INPUT_SKIP_CHECKOUT=true
|
||||||
|
|
||||||
run git branch
|
run git branch
|
||||||
refute_line --partial "existing-remote-branch"
|
refute_line --partial "existing-remote-branch"
|
||||||
@@ -772,7 +795,7 @@ cat_github_output() {
|
|||||||
refute [assert_equal $current_sha $remote_sha]
|
refute [assert_equal $current_sha $remote_sha]
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "It fails to push commit to remote if branch already exists and local repo is behind its remote counterpart" {
|
@test "It fails to push commit to remote if branch already exists and local repo is behind its remote counterpart and SKIP_CHECKOUT is used" {
|
||||||
# Create `new-branch` on remote with changes the local repository does not yet have
|
# Create `new-branch` on remote with changes the local repository does not yet have
|
||||||
cd $FAKE_TEMP_LOCAL_REPOSITORY
|
cd $FAKE_TEMP_LOCAL_REPOSITORY
|
||||||
|
|
||||||
@@ -791,6 +814,7 @@ cat_github_output() {
|
|||||||
cd $FAKE_LOCAL_REPOSITORY
|
cd $FAKE_LOCAL_REPOSITORY
|
||||||
|
|
||||||
INPUT_BRANCH="new-branch"
|
INPUT_BRANCH="new-branch"
|
||||||
|
INPUT_SKIP_CHECKOUT=true
|
||||||
|
|
||||||
# Assert that local remote does not have a "new-branch"-branch nor does
|
# Assert that local remote does not have a "new-branch"-branch nor does
|
||||||
# know about the remote branch.
|
# know about the remote branch.
|
||||||
@@ -809,8 +833,7 @@ cat_github_output() {
|
|||||||
assert_line "INPUT_BRANCH value: new-branch"
|
assert_line "INPUT_BRANCH value: new-branch"
|
||||||
assert_line --partial "::debug::Push commit to remote branch new-branch"
|
assert_line --partial "::debug::Push commit to remote branch new-branch"
|
||||||
|
|
||||||
assert_line --partial "Updates were rejected because the remote contains work that you do"
|
assert_line --partial "Updates were rejected because a pushed branch tip is behind its remote"
|
||||||
assert_line --partial "This is usually caused by another repository pushing"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "throws fatal error if file pattern includes files that do not exist" {
|
@test "throws fatal error if file pattern includes files that do not exist" {
|
||||||
@@ -1031,8 +1054,9 @@ cat_github_output() {
|
|||||||
assert_line "INPUT_FILE_PATTERN: ."
|
assert_line "INPUT_FILE_PATTERN: ."
|
||||||
assert_line "INPUT_COMMIT_OPTIONS: "
|
assert_line "INPUT_COMMIT_OPTIONS: "
|
||||||
assert_line "::debug::Apply commit options "
|
assert_line "::debug::Apply commit options "
|
||||||
|
assert_line "INPUT_TAG_NAME: "
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: "
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
assert_line "No tagging message supplied. No tag will be added."
|
assert_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
assert_line "INPUT_PUSH_OPTIONS: "
|
assert_line "INPUT_PUSH_OPTIONS: "
|
||||||
assert_line "::debug::Apply push options "
|
assert_line "::debug::Apply push options "
|
||||||
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
||||||
@@ -1097,8 +1121,7 @@ END
|
|||||||
assert_line "::error::Not a git repository. Please make sure to run this action in a git repository. Adjust the `repository` input if necessary."
|
assert_line "::error::Not a git repository. Please make sure to run this action in a git repository. Adjust the `repository` input if necessary."
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "It detects if the repository is in a detached state and exits with an error" {
|
@test "It detects if the repository is in a detached state and logs a warning" {
|
||||||
skip
|
|
||||||
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
run git_auto_commit
|
run git_auto_commit
|
||||||
@@ -1113,13 +1136,14 @@ END
|
|||||||
|
|
||||||
run git_auto_commit
|
run git_auto_commit
|
||||||
|
|
||||||
assert_failure;
|
assert_success;
|
||||||
assert_line "::error::Repository is in detached HEAD state. Please make sure you check out a branch. Adjust the `ref` input accordingly."
|
assert_line "::warning::Repository is in a detached HEAD state. git-auto-commit will likely handle this automatically. To avoid it, check out a branch using the ref option in actions/checkout."
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "it creates a tag if create_git_tag_only is set to true and a message has been supplied" {
|
@test "it creates a tag if create_git_tag_only is set to true and a message has been supplied" {
|
||||||
INPUT_CREATE_GIT_TAG_ONLY=true
|
INPUT_CREATE_GIT_TAG_ONLY=true
|
||||||
INPUT_TAGGING_MESSAGE=v1.0.0
|
INPUT_TAG_NAME=v1.0.0
|
||||||
|
INPUT_TAGGING_MESSAGE="MyProduct v1.0.0"
|
||||||
|
|
||||||
run git_auto_commit
|
run git_auto_commit
|
||||||
|
|
||||||
@@ -1127,8 +1151,8 @@ END
|
|||||||
|
|
||||||
assert_line "::debug::Create git tag only"
|
assert_line "::debug::Create git tag only"
|
||||||
|
|
||||||
assert_line "::debug::Create tag v1.0.0"
|
assert_line "::debug::Create tag v1.0.0: MyProduct v1.0.0"
|
||||||
refute_line "No tagging message supplied. No tag will be added."
|
refute_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
|
|
||||||
assert_line "::debug::Apply push options "
|
assert_line "::debug::Apply push options "
|
||||||
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
||||||
@@ -1139,8 +1163,8 @@ END
|
|||||||
refute_line -e "commit_hash=[0-9a-f]{40}$"
|
refute_line -e "commit_hash=[0-9a-f]{40}$"
|
||||||
|
|
||||||
# Assert a tag v1.0.0 has been created
|
# Assert a tag v1.0.0 has been created
|
||||||
run git tag
|
run git tag -n
|
||||||
assert_output v1.0.0
|
assert_output 'v1.0.0 MyProduct v1.0.0'
|
||||||
|
|
||||||
run git ls-remote --tags --refs
|
run git ls-remote --tags --refs
|
||||||
assert_output --partial refs/tags/v1.0.0
|
assert_output --partial refs/tags/v1.0.0
|
||||||
@@ -1148,14 +1172,16 @@ END
|
|||||||
|
|
||||||
@test "it output no tagging message supplied if no tagging message is set but create_git_tag_only is set to true" {
|
@test "it output no tagging message supplied if no tagging message is set but create_git_tag_only is set to true" {
|
||||||
INPUT_CREATE_GIT_TAG_ONLY=true
|
INPUT_CREATE_GIT_TAG_ONLY=true
|
||||||
|
INPUT_TAG_NAME=""
|
||||||
INPUT_TAGGING_MESSAGE=""
|
INPUT_TAGGING_MESSAGE=""
|
||||||
|
|
||||||
run git_auto_commit
|
run git_auto_commit
|
||||||
|
|
||||||
assert_success
|
assert_success
|
||||||
|
|
||||||
|
assert_line "INPUT_TAG_NAME: "
|
||||||
assert_line "INPUT_TAGGING_MESSAGE: "
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
assert_line "No tagging message supplied. No tag will be added."
|
assert_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
assert_line "::debug::Create git tag only"
|
assert_line "::debug::Create git tag only"
|
||||||
|
|
||||||
run cat_github_output
|
run cat_github_output
|
||||||
@@ -1168,16 +1194,330 @@ END
|
|||||||
assert_output ""
|
assert_output ""
|
||||||
}
|
}
|
||||||
|
|
||||||
@test "it shows warning message if any deprecated options are used" {
|
@test "script fails to push commit to new branch that does not exist yet" {
|
||||||
INPUT_SKIP_FETCH=true
|
INPUT_BRANCH="not-existend-branch"
|
||||||
INPUT_SKIP_CHECKOUT=true
|
INPUT_CREATE_BRANCH=false
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
refute_line --partial "not-existend-branch"
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
refute_line --partial "origin/not-existend-branch"
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_failure
|
||||||
|
|
||||||
|
assert_line "INPUT_REPOSITORY value: ${INPUT_REPOSITORY}"
|
||||||
|
assert_line "INPUT_BRANCH value: not-existend-branch"
|
||||||
|
assert_line "fatal: invalid reference: not-existend-branch"
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
refute_line --partial "not-existend-branch"
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
refute_line --partial "origin/not-existend-branch"
|
||||||
|
|
||||||
|
run cat_github_output
|
||||||
|
assert_line "changes_detected=true"
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "It creates new local branch and pushes the new branch to remote" {
|
||||||
|
INPUT_BRANCH="not-existend-branch"
|
||||||
INPUT_CREATE_BRANCH=true
|
INPUT_CREATE_BRANCH=true
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
refute_line --partial "not-existend-branch"
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
refute_line --partial "origin/not-existend-branch"
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
run git_auto_commit
|
run git_auto_commit
|
||||||
|
|
||||||
assert_success
|
assert_success
|
||||||
|
|
||||||
assert_line "::warning::git-auto-commit: skip_fetch has been removed in v6. It does not have any effect anymore."
|
assert_line "INPUT_REPOSITORY value: ${INPUT_REPOSITORY}"
|
||||||
assert_line "::warning::git-auto-commit: skip_checkout has been removed in v6. It does not have any effect anymore."
|
assert_line "INPUT_BRANCH value: not-existend-branch"
|
||||||
assert_line "::warning::git-auto-commit: create_branch has been removed in v6. It does not have any effect anymore."
|
assert_line "INPUT_FILE_PATTERN: ."
|
||||||
|
assert_line "INPUT_COMMIT_OPTIONS: "
|
||||||
|
assert_line "::debug::Apply commit options "
|
||||||
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
|
assert_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
|
assert_line "INPUT_PUSH_OPTIONS: "
|
||||||
|
assert_line "::debug::Apply push options "
|
||||||
|
assert_line "::debug::Push commit to remote branch not-existend-branch"
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
assert_line --partial "not-existend-branch"
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
assert_line --partial "origin/not-existend-branch"
|
||||||
|
|
||||||
|
run cat_github_output
|
||||||
|
assert_line "changes_detected=true"
|
||||||
|
assert_line -e "commit_hash=[0-9a-f]{40}$"
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "It does not create new local branch if local branch already exists and SKIP_CHECKOUT is true" {
|
||||||
|
git checkout -b not-existend-remote-branch
|
||||||
|
git checkout ${FAKE_DEFAULT_BRANCH}
|
||||||
|
|
||||||
|
INPUT_BRANCH="not-existend-remote-branch"
|
||||||
|
INPUT_SKIP_CHECKOUT=true
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
assert_line --partial "not-existend-remote-branch"
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
refute_line --partial "origin/not-existend-remote-branch"
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
assert_line "INPUT_REPOSITORY value: ${INPUT_REPOSITORY}"
|
||||||
|
assert_line "INPUT_BRANCH value: not-existend-remote-branch"
|
||||||
|
assert_line "INPUT_FILE_PATTERN: ."
|
||||||
|
assert_line "INPUT_COMMIT_OPTIONS: "
|
||||||
|
assert_line "::debug::Apply commit options "
|
||||||
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
|
assert_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
|
assert_line "INPUT_PUSH_OPTIONS: "
|
||||||
|
assert_line "::debug::Apply push options "
|
||||||
|
assert_line "::debug::Push commit to remote branch not-existend-remote-branch"
|
||||||
|
|
||||||
|
# Assert checked out branch is still the same.
|
||||||
|
run git rev-parse --abbrev-ref HEAD
|
||||||
|
assert_line --partial ${FAKE_DEFAULT_BRANCH}
|
||||||
|
refute_line --partial "not-existend-remote-branch"
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
assert_line --partial "not-existend-remote-branch"
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
assert_line --partial "origin/not-existend-remote-branch"
|
||||||
|
|
||||||
|
run cat_github_output
|
||||||
|
assert_line "changes_detected=true"
|
||||||
|
assert_line -e "commit_hash=[0-9a-f]{40}$"
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "it creates new local branch and pushes branch to remote even if the remote branch already exists" {
|
||||||
|
|
||||||
|
# Create `existing-remote-branch` on remote with changes the local repository does not yet have
|
||||||
|
cd $FAKE_TEMP_LOCAL_REPOSITORY
|
||||||
|
git checkout -b "existing-remote-branch"
|
||||||
|
touch new-branch-file.txt
|
||||||
|
git add new-branch-file.txt
|
||||||
|
git commit -m "Add additional file"
|
||||||
|
git push origin existing-remote-branch
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
assert_line --partial "existing-remote-branch"
|
||||||
|
|
||||||
|
# ---------
|
||||||
|
# Switch to our regular local repository and run `git-auto-commit`
|
||||||
|
cd $FAKE_LOCAL_REPOSITORY
|
||||||
|
|
||||||
|
INPUT_BRANCH="existing-remote-branch"
|
||||||
|
INPUT_CREATE_BRANCH=true
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
refute_line --partial "existing-remote-branch"
|
||||||
|
|
||||||
|
run git fetch --all
|
||||||
|
run git pull origin existing-remote-branch
|
||||||
|
run git branch -r
|
||||||
|
assert_line --partial "origin/existing-remote-branch"
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
assert_line "INPUT_REPOSITORY value: ${INPUT_REPOSITORY}"
|
||||||
|
assert_line "INPUT_BRANCH value: existing-remote-branch"
|
||||||
|
assert_line "INPUT_FILE_PATTERN: ."
|
||||||
|
assert_line "INPUT_COMMIT_OPTIONS: "
|
||||||
|
assert_line "::debug::Apply commit options "
|
||||||
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
|
assert_line "Neither tag nor tag message is set. No tag will be added."
|
||||||
|
assert_line "INPUT_PUSH_OPTIONS: "
|
||||||
|
assert_line "::debug::Apply push options "
|
||||||
|
assert_line "::debug::Push commit to remote branch existing-remote-branch"
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
assert_line --partial "existing-remote-branch"
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
assert_line --partial "origin/existing-remote-branch"
|
||||||
|
|
||||||
|
# Assert that branch "existing-remote-branch" was updated on remote
|
||||||
|
current_sha="$(git rev-parse --verify --short existing-remote-branch)"
|
||||||
|
remote_sha="$(git rev-parse --verify --short origin/existing-remote-branch)"
|
||||||
|
|
||||||
|
assert_equal $current_sha $remote_sha
|
||||||
|
|
||||||
|
run cat_github_output
|
||||||
|
assert_line "changes_detected=true"
|
||||||
|
assert_line -e "commit_hash=[0-9a-f]{40}$"
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "script fails if new local branch is checked out and push fails as remote has newer commits than local" {
|
||||||
|
# Create `existing-remote-branch` on remote with changes the local repository does not yet have
|
||||||
|
cd $FAKE_TEMP_LOCAL_REPOSITORY
|
||||||
|
git checkout -b "existing-remote-branch"
|
||||||
|
touch new-branch-file.txt
|
||||||
|
git add new-branch-file.txt
|
||||||
|
git commit -m "Add additional file"
|
||||||
|
git push origin existing-remote-branch
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
assert_line --partial "existing-remote-branch"
|
||||||
|
|
||||||
|
# ---------
|
||||||
|
# Switch to our regular local repository and run `git-auto-commit`
|
||||||
|
cd $FAKE_LOCAL_REPOSITORY
|
||||||
|
|
||||||
|
INPUT_BRANCH="existing-remote-branch"
|
||||||
|
INPUT_CREATE_BRANCH=true
|
||||||
|
|
||||||
|
run git branch
|
||||||
|
refute_line --partial "existing-remote-branch"
|
||||||
|
|
||||||
|
run git fetch --all
|
||||||
|
run git branch -r
|
||||||
|
assert_line --partial "origin/existing-remote-branch"
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_failure
|
||||||
|
|
||||||
|
assert_line "hint: Updates were rejected because the tip of your current branch is behind"
|
||||||
|
|
||||||
|
# Assert that branch exists locally and on remote
|
||||||
|
run git branch
|
||||||
|
assert_line --partial "existing-remote-branch"
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
assert_line --partial "origin/existing-remote-branch"
|
||||||
|
|
||||||
|
# Assert that branch "existing-remote-branch" was not updated on remote
|
||||||
|
current_sha="$(git rev-parse --verify --short existing-remote-branch)"
|
||||||
|
remote_sha="$(git rev-parse --verify --short origin/existing-remote-branch)"
|
||||||
|
|
||||||
|
refute [assert_equal $current_sha $remote_sha]
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "It pushes commit to remote if branch already exists and local repo is behind its remote counterpart" {
|
||||||
|
# Create `new-branch` on remote with changes the local repository does not yet have
|
||||||
|
cd $FAKE_TEMP_LOCAL_REPOSITORY
|
||||||
|
|
||||||
|
git checkout -b "new-branch"
|
||||||
|
touch new-branch-file.txt
|
||||||
|
git add new-branch-file.txt
|
||||||
|
|
||||||
|
git commit --quiet -m "Add additional file"
|
||||||
|
git push origin new-branch
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
assert_line --partial "origin/new-branch"
|
||||||
|
|
||||||
|
# ---------
|
||||||
|
# Switch to our regular local repository and run `git-auto-commit`
|
||||||
|
cd $FAKE_LOCAL_REPOSITORY
|
||||||
|
|
||||||
|
INPUT_BRANCH="new-branch"
|
||||||
|
|
||||||
|
# Assert that local remote does not know have "new-branch" locally nor does
|
||||||
|
# know about the remote branch.
|
||||||
|
run git branch
|
||||||
|
refute_line --partial "new-branch"
|
||||||
|
|
||||||
|
run git branch -r
|
||||||
|
refute_line --partial "origin/new-branch"
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
assert_line "INPUT_BRANCH value: new-branch"
|
||||||
|
assert_line --partial "::debug::Push commit to remote branch new-branch"
|
||||||
|
|
||||||
|
# Assert that branch "new-branch" was updated on remote
|
||||||
|
current_sha="$(git rev-parse --verify --short new-branch)"
|
||||||
|
remote_sha="$(git rev-parse --verify --short origin/new-branch)"
|
||||||
|
|
||||||
|
assert_equal $current_sha $remote_sha
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "Set a tag message only" {
|
||||||
|
INPUT_TAGGING_MESSAGE="v1.0.0"
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
assert_line "INPUT_TAG_NAME: "
|
||||||
|
assert_line "INPUT_TAGGING_MESSAGE: v1.0.0"
|
||||||
|
|
||||||
|
assert_line "::debug::Create tag v1.0.0: v1.0.0"
|
||||||
|
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
||||||
|
|
||||||
|
# Assert a tag v1.0.0 has been created
|
||||||
|
run git tag -n
|
||||||
|
assert_output 'v1.0.0 v1.0.0'
|
||||||
|
|
||||||
|
run git ls-remote --tags --refs
|
||||||
|
assert_output --partial refs/tags/v1.0.0
|
||||||
|
|
||||||
|
# Assert that the commit has been pushed with --force and
|
||||||
|
# sha values are equal on local and remote
|
||||||
|
current_sha="$(git rev-parse --verify --short ${FAKE_DEFAULT_BRANCH})"
|
||||||
|
remote_sha="$(git rev-parse --verify --short origin/${FAKE_DEFAULT_BRANCH})"
|
||||||
|
|
||||||
|
assert_equal $current_sha $remote_sha
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "Set a tag only" {
|
||||||
|
INPUT_TAG_NAME="v1.0.0"
|
||||||
|
|
||||||
|
touch "${FAKE_LOCAL_REPOSITORY}"/new-file-{1,2,3}.txt
|
||||||
|
|
||||||
|
run git_auto_commit
|
||||||
|
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
assert_line "INPUT_TAG_NAME: v1.0.0"
|
||||||
|
assert_line "INPUT_TAGGING_MESSAGE: "
|
||||||
|
|
||||||
|
assert_line "::debug::Create tag v1.0.0: v1.0.0"
|
||||||
|
assert_line "::debug::Push commit to remote branch ${FAKE_DEFAULT_BRANCH}"
|
||||||
|
|
||||||
|
# Assert a tag v1.0.0 has been created
|
||||||
|
run git tag -n
|
||||||
|
assert_output 'v1.0.0 v1.0.0'
|
||||||
|
|
||||||
|
run git ls-remote --tags --refs
|
||||||
|
assert_output --partial refs/tags/v1.0.0
|
||||||
|
|
||||||
|
# Assert that the commit has been pushed with --force and
|
||||||
|
# sha values are equal on local and remote
|
||||||
|
current_sha="$(git rev-parse --verify --short ${FAKE_DEFAULT_BRANCH})"
|
||||||
|
remote_sha="$(git rev-parse --verify --short origin/${FAKE_DEFAULT_BRANCH})"
|
||||||
|
|
||||||
|
assert_equal $current_sha $remote_sha
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user