Skip to content

Commit 370e85a

Browse files
authored
Merge pull request #50 from ianlewis/repo-template
Sync w/ upstream ianlewis/repo-template
2 parents e0cbb10 + 5a3f676 commit 370e85a

File tree

4 files changed

+53
-45
lines changed

4 files changed

+53
-45
lines changed

.textlintrc.yaml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,39 @@ rules:
2121
spelling:
2222
language: "en"
2323
skipPatterns:
24-
- "Codecov" # Code coverage service
24+
- "/\\bCodecov\\b/" # Code coverage service
2525

26-
- "CHANGELOG"
27-
- "CODEOWNER"
28-
- "CLA"
29-
- "CLI"
30-
- "CVSS"
31-
- "DCO"
32-
- "PR"
33-
- "UI"
34-
- "YAML"
35-
- "Changelog"
36-
- "CodeQL"
37-
- "Dependabot"
38-
- "JavaScript"
39-
- "MacOS"
40-
- "Makefile"
41-
- "Node.js"
42-
- "OpenSSF"
43-
- "TODO"
44-
- "e2e"
45-
- "/[Ff]ormatter/"
46-
- "/[Ll]inter/"
47-
- "/[Pp]re/"
48-
- "/[Rr]ebase/"
49-
- "/[Rr]eproducibility/"
50-
- "/[Rr]uleset/"
51-
- "/[Rr]untime/"
52-
- "/[Ss]exualized/"
53-
- "/[Ss]ocio-economic/"
54-
- "/[Uu]serspace/"
55-
- "/[Vv]endored/"
56-
- "/[Vv]irtualenv/"
57-
- "/v[0-9]+/"
58-
- "/[0-9]+/"
26+
- "/\\bCHANGELOG\\b/g"
27+
- "/\\bCODEOWNER\\b/g"
28+
- "/\\bCLA\\b/g"
29+
- "/\\bCLI\\b/g"
30+
- "/\\bCVSS\\b/g"
31+
- "/\\bDCO\\b/g"
32+
- "/\\bPRs?\\b/g"
33+
- "/\\bUI\\b/g"
34+
- "/\\bYAML\\b/g"
35+
- "/\\bChangelog\\b/g"
36+
- "/\\bCodeQL\\b/g"
37+
- "/\\bDependabot\\b/g"
38+
- "/\\bJavaScript\\b/g"
39+
- "/\\bMacOS\\b/g"
40+
- "/\\bMakefile\\b/g"
41+
- "/\\bNode.js\\b/g"
42+
- "/\\bOpenSSF\\b/g"
43+
- "/\\bTODOs?\\b/g"
44+
- "/\\be2e\\b/g"
45+
- "/\\b[Ff]ormatters?\\b/g"
46+
- "/\\b[Ll]inters?\\b/g"
47+
- "/\\b[Pp]ositivity\\b/g"
48+
- "/\\b[Pp]re\\b/g"
49+
- "/\\b[Rr]ebase\\b/g"
50+
- "/\\b[Rr]eproducibility\\b/g"
51+
- "/\\b[Rr]ulesets?\\b/g"
52+
- "/\\b[Rr]untimes?\\b/g"
53+
- "/\\b[Ss]exualized\\b/g"
54+
- "/\\b[Ss]ocio-economic\\b/g"
55+
- "/\\b[Uu]serspace\\b/g"
56+
- "/\\b[Vv]endored\\b/g"
57+
- "/\\b[Vv]irtualenv\\b/g"
58+
- "/\\bv?[0-9]+\\b/g"
5959
- ":white_check_mark:"

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,13 @@ format-check: ## Check that files are properly formatted.
409409
exit_code=0; \
410410
if [ -n "$$(git diff)" ]; then \
411411
>&2 echo "Some files need to be formatted. Please run 'make format' and try again."; \
412+
if [ "$(OUTPUT_FORMAT)" == "github" ]; then \
413+
echo "::group::git diff"; \
414+
fi; \
412415
git --no-pager diff; \
416+
if [ "$(OUTPUT_FORMAT)" == "github" ]; then \
417+
echo "::endgroup::"; \
418+
fi; \
413419
exit_code=1; \
414420
fi; \
415421
git restore .; \

SECURITY.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This document describes the security policy that applies to this repository.
77
Security updates for this repository will be applied the most recent major
88
version and its minor versions.
99

10-
For example if 2.2.0 is the latest version:
10+
For example, if 2.2.0 is the latest version:
1111

1212
| Version | Supported |
1313
| ------- | ------------------ |
@@ -17,7 +17,7 @@ For example if 2.2.0 is the latest version:
1717
| < 2.0.0 | :x: |
1818

1919
However, if the repository has not made a stable release (e.g. the latest
20-
release is < v1.0.0) then only the most latest minor version will be patched.
20+
release is < v1.0.0) then only the latest minor version will be patched.
2121

2222
## Security Release & Disclosure Process
2323

@@ -46,25 +46,25 @@ It is reasonable to delay disclosure when the bug or the fix is not yet fully
4646
understood, the solution is not well-tested, or for vendor coordination. The
4747
time frame for disclosure is from immediate (especially if it's already publicly
4848
known) to several weeks. For a vulnerability with a straightforward mitigation,
49-
we expect report date to disclosure date to be on the order of 14 days.
49+
we expect the report date to disclosure date to be on the order of 14 days.
5050

5151
If you know of a publicly disclosed security vulnerability please IMMEDIATELY
5252
[report the vulnerability](#reporting-a-vulnerability) so that the patch,
5353
release, and communication process can be started as early as possible.
5454

55-
If the reporter does not go through the private disclosure process, the fix and
55+
If the reporter does not go through the private disclosure process, the fix, and
5656
release process will proceed as swiftly as possible. In extreme cases you can
5757
ask GitHub to delete the issue but this generally isn't necessary and is
5858
unlikely to make a public disclosure less damaging.
5959

6060
### Security Releases
6161

62-
Once a fix is available it will be released, the GitHub Security Advisory made
63-
public and announced via project communication channels. Security releases
64-
will clearly marked as a security release and include information on which
65-
vulnerabilities were fixed. As much as possible this announcement should be
66-
actionable, and include any mitigating steps users can take prior to upgrading
67-
to a fixed version.
62+
Once a fix is available, it will be released, the GitHub Security Advisory made
63+
public, and the fix release announced via project communication channels.
64+
Security releases will be clearly marked as a security release and include
65+
information on which vulnerabilities were fixed. As much as possible this
66+
announcement should be actionable, and include any mitigating steps users can
67+
take prior to upgrading to a fixed version.
6868

6969
Fixes will be applied in patch releases to all [supported
7070
versions](#supported-versions) and all fixed vulnerabilities will be noted in
@@ -79,7 +79,7 @@ Vulnerability severity is evaluated on a case-by-case basis, guided by [CVSS
7979

8080
We aim to reduce the number of security issues through several general
8181
security-conscious development practices including the use of unit-tests,
82-
end-to-end (e2e) tests, static and dynamic analysis tools, and use of
82+
end-to-end (e2e) tests, static, and dynamic analysis tools, and use of
8383
memory-safe languages.
8484

8585
We aim to fix issues discovered by analysis tools as quickly as possible. We

renovate.json5

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
// NOTE: Set the prHourlyLimit to 0 to disable the hourly limit. This is done
2323
// because we are using a monthly schedule and the default hourly limit of 2
2424
// would cause Renovate to only create 2 PRs every month.
25+
// Similarly set prConcurrentLimit to 0 to disable the concurrent PR limit.
2526
prHourlyLimit: 0,
27+
prConcurrentLimit: 0,
2628

2729
// Security alerts/updates.
2830
vulnerabilityAlerts: {

0 commit comments

Comments
 (0)