Skip to content

Commit 06daf79

Browse files
conflicted commits cherry picked manually
1 parent a8fa08e commit 06daf79

File tree

3 files changed

+126
-48
lines changed

3 files changed

+126
-48
lines changed

README.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Adding git-auto-commit to your Workflow only takes a couple lines of code.
1616
2. Add the following step at the end of your job, after other steps that might add or change files.
1717

1818
```yaml
19-
- uses: step-security/git-auto-commit-action@v5
19+
- uses: step-security/git-auto-commit-action@v7
2020
```
2121
2222
Your Workflow should look similar to this example.
@@ -36,15 +36,15 @@ jobs:
3636
contents: write
3737

3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v5
4040
with:
4141
ref: ${{ github.head_ref }}
4242

4343
# Other steps that change files in the repository go here
4444
#
4545

4646
# Commit all changed files back to the repository
47-
- uses: step-security/git-auto-commit-action@v5
47+
- uses: step-security/git-auto-commit-action@v7
4848
```
4949
5050
> [!NOTE]
@@ -53,7 +53,7 @@ jobs:
5353
The following is an extended example with all available options.
5454

5555
```yaml
56-
- uses: step-security/git-auto-commit-action@v5
56+
- uses: step-security/git-auto-commit-action@v7
5757
with:
5858
# Optional. Commit message for the created commit.
5959
# Defaults to "Apply automatic changes"
@@ -85,11 +85,11 @@ The following is an extended example with all available options.
8585

8686
# Optional. Tag name to be created in the local repository and
8787
# pushed to the remote repository on the defined branch.
88-
# If only one of `tag` or `tagging_message` is provided, the value of the provided field will be used for both tag name and message.
89-
tag: 'v1.0.0'
88+
# 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.
89+
tag_name: 'v1.0.0'
9090

9191
# Optional. Message to annotate the created tag with.
92-
# If only one of `tag` or `tagging_message` is provided, the value of the provided field will be used for both tag name and message.
92+
# 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.
9393
tagging_message: 'Codename "Sunshine"'
9494

9595
# Optional. Option used by `git-status` to determine if the repository is
@@ -152,14 +152,14 @@ jobs:
152152
contents: write
153153
154154
steps:
155-
- uses: actions/checkout@v4
155+
- uses: actions/checkout@v5
156156
with:
157157
ref: ${{ github.head_ref }}
158158
159159
- name: Run php-cs-fixer
160160
uses: docker://oskarstark/php-cs-fixer-ga
161161
162-
- uses: step-security/git-auto-commit-action@v5
162+
- uses: step-security/git-auto-commit-action@v7
163163
with:
164164
commit_message: Apply php-cs-fixer changes
165165
```
@@ -181,7 +181,7 @@ You can use these outputs to trigger other Actions in your Workflow run based on
181181
### Example
182182

183183
```yaml
184-
- uses: step-security/git-auto-commit-action@v5
184+
- uses: step-security/git-auto-commit-action@v7
185185
id: auto-commit-action #mandatory for the output to show up in ${{ steps }}
186186
with:
187187
commit_message: Apply php-cs-fixer changes
@@ -217,7 +217,7 @@ You must use `action/checkout@v2` or later versions to check out the repository.
217217
In non-`push` events, such as `pull_request`, make sure to specify the `ref` to check out:
218218

219219
```yaml
220-
- uses: actions/checkout@v4
220+
- uses: actions/checkout@v5
221221
with:
222222
ref: ${{ github.head_ref }}
223223
```
@@ -235,7 +235,7 @@ You can change this by creating a new [Personal Access Token (PAT)](https://gith
235235
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.
236236

237237
```yaml
238-
- uses: actions/checkout@v4
238+
- uses: actions/checkout@v5
239239
with:
240240
token: ${{ secrets.PAT }}
241241
```
@@ -281,7 +281,7 @@ The example below can be used as a starting point to generate a multiline commit
281281
# Quick and dirty step to get rid of the temporary file holding the commit message
282282
- run: rm -rf commitmessage.txt
283283
284-
- uses: step-security/git-auto-commit-action@v5
284+
- uses: step-security/git-auto-commit-action@v7
285285
id: commit
286286
with:
287287
commit_message: ${{ steps.commit_message_step.outputs.commit_message }}
@@ -305,7 +305,7 @@ As git-auto-commit by default does not use **your** username and email when crea
305305
git_commit_gpgsign: true
306306
307307
- name: "Commit and push changes"
308-
uses: step-security/git-auto-commit-action@v5
308+
uses: step-security/git-auto-commit-action@v7
309309
with:
310310
commit_author: "${{ steps.import-gpg.outputs.name }} <${{ steps.import-gpg.outputs.email }}>"
311311
commit_user_name: ${{ steps.import-gpg.outputs.name }}
@@ -365,7 +365,7 @@ jobs:
365365
contents: write
366366
367367
steps:
368-
- uses: actions/checkout@v4
368+
- uses: actions/checkout@v5
369369
with:
370370
# Checkout the fork/head-repository and push changes to the fork.
371371
# If you skip this, the base repository will be checked out and changes
@@ -379,7 +379,7 @@ jobs:
379379
- name: Run php-cs-fixer
380380
uses: docker://oskarstark/php-cs-fixer-ga
381381
382-
- uses: step-security/git-auto-commit-action@v5
382+
- uses: step-security/git-auto-commit-action@v7
383383
```
384384

385385
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/).
@@ -414,7 +414,7 @@ The steps in your workflow might look like this:
414414
echo "message=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
415415
echo "author=$(git log -1 --pretty=\"%an <%ae>\")" >> $GITHUB_OUTPUT
416416
417-
- uses: step-security/git-auto-commit-action@v5
417+
- uses: step-security/git-auto-commit-action@v7
418418
with:
419419
commit_author: ${{ steps.last-commit.outputs.author }}
420420
commit_message: ${{ steps.last-commit.outputs.message }}
@@ -454,7 +454,7 @@ If you create a personal access token (classic), apply the `repo` and `workflow`
454454
If you create a fine-grained personal access token, apply the `Contents`-permissions.
455455
456456
```yaml
457-
- uses: actions/checkout@v4
457+
- uses: actions/checkout@v5
458458
with:
459459
# 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".
460460
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
@@ -468,7 +468,7 @@ You can learn more about Personal Access Token in the [GitHub documentation](htt
468468
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.
469469
470470
```yaml
471-
- uses: step-security/git-auto-commit-action@v5
471+
- uses: step-security/git-auto-commit-action@v7
472472
with:
473473
commit_message: Apply php-cs-fixer changes
474474
push_options: --force
@@ -497,7 +497,7 @@ This is due to the fact, that the `*.md`-glob is expanded before sending it to `
497497
To fix this add `disable_globbing: true` to your Workflow.
498498
499499
```yaml
500-
- uses: step-security/git-auto-commit-action@v5
500+
- uses: step-security/git-auto-commit-action@v7
501501
with:
502502
file_pattern: '*.md'
503503
disable_globbing: true
@@ -524,7 +524,7 @@ yarn test
524524
525525
We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/step-security/git-auto-commit-action/tags).
526526
527-
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 `step-security/git-auto-commit-action@v5` to always use the latest release of the current major version.
527+
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 `step-security/git-auto-commit-action@v7` to always use the latest release of the current major version.
528528
(More information about this [here](https://help.github.com/en/actions/building-actions/about-actions#versioning-your-action).)
529529
530530

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ outputs:
9292
description: Value is "true", if a git tag was created using the `create_git_tag_only`-input.
9393

9494
runs:
95-
using: 'node20'
95+
using: 'node24'
9696
main: 'dist/index.js'
9797

9898
branding:

0 commit comments

Comments
 (0)