Skip to content

Commit 3da7387

Browse files
committed
Merge branch 'main' into no-json
2 parents 1334612 + c59d9b8 commit 3da7387

File tree

15 files changed

+2272
-1499
lines changed

15 files changed

+2272
-1499
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,15 @@
524524
"contributions": [
525525
"doc"
526526
]
527+
},
528+
{
529+
"login": "icemac",
530+
"name": "Michael Howitz",
531+
"avatar_url": "https://avatars.githubusercontent.com/u/386619?v=4",
532+
"profile": "https://minddistrict.de",
533+
"contributions": [
534+
"doc"
535+
]
527536
}
528537
],
529538
"contributorsPerLine": 7,

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ jobs:
3131

3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v5
3535

3636
# Initializes the CodeQL tools for scanning.
3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@v3
38+
uses: github/codeql-action/init@v4
3939
# Override language selection by uncommenting this and choosing your languages
4040
# with:
4141
# languages: go, javascript, csharp, python, cpp, java
4242

4343
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4444
# If this step fails, then you should remove it and run the build manually (see below).
4545
- name: Autobuild
46-
uses: github/codeql-action/autobuild@v3
46+
uses: github/codeql-action/autobuild@v4
4747

4848
# ℹ️ Command-line programs to run using the OS shell.
4949
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -57,4 +57,4 @@ jobs:
5757
# make release
5858

5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@v3
60+
uses: github/codeql-action/analyze@v4
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: 'Dependency Review'
2+
on: [pull_request]
3+
4+
permissions:
5+
contents: read
6+
7+
jobs:
8+
dependency-review:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: 'Checkout Repository'
12+
uses: actions/checkout@v5
13+
- name: 'Dependency Review'
14+
uses: actions/dependency-review-action@v4

.github/workflows/label-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Run EndBug/label-sync
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- uses: EndBug/label-sync@v2
1717
with:
1818
config-file: '.github/labels.yml'

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77
jobs:
88
build:
99
name: Build
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: actions/setup-node@v4
12+
- uses: actions/checkout@v5
13+
- uses: actions/setup-node@v6
1414
with:
1515
cache: npm
1616
- run: npm ci
@@ -29,10 +29,10 @@ jobs:
2929

3030
lint:
3131
name: Lint
32-
runs-on: ubuntu-20.04
32+
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@v4
35-
- uses: actions/setup-node@v4
34+
- uses: actions/checkout@v5
35+
- uses: actions/setup-node@v6
3636
with:
3737
cache: npm
3838
- run: npm ci

.prettierrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
...require('gts/.prettierrc.json')
3-
}
2+
...require('gts/.prettierrc.json'),
3+
};

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 128 deletions
This file was deleted.

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ Some users reported that they were getting an error:
206206

207207
If you're getting this error and you're using `actions/checkout@v1`, try upgrading to `actions/checkout@v2`. If you're still having problems after upgrading, feel free to open an issue. Issue ref: [#146](https://github.com/EndBug/add-and-commit/issues/146)
208208

209+
Please note that using `persist-credentials: false` will lead to the same issue.
210+
209211
### Performance on large repos
210212

211213
By default, the action will fetch the repository before starting to work on it: this ensures that it can see the already existing refs.
@@ -428,6 +430,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
428430
<td align="center" valign="top" width="14.28%"><a href="http://droettboom.com"><img src="https://avatars.githubusercontent.com/u/38294?v=4?s=100" width="100px;" alt="Michael Droettboom"/><br /><sub><b>Michael Droettboom</b></sub></a><br /><a href="#maintenance-mdboom" title="Maintenance">🚧</a></td>
429431
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tommie"><img src="https://avatars.githubusercontent.com/u/216382?v=4?s=100" width="100px;" alt="tommie"/><br /><sub><b>tommie</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=tommie" title="Documentation">📖</a></td>
430432
</tr>
433+
<tr>
434+
<td align="center" valign="top" width="14.28%"><a href="https://minddistrict.de"><img src="https://avatars.githubusercontent.com/u/386619?v=4?s=100" width="100px;" alt="Michael Howitz"/><br /><sub><b>Michael Howitz</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=icemac" title="Documentation">📖</a></td>
435+
</tr>
431436
</tbody>
432437
</table>
433438

lib/index.js

Lines changed: 4 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)