@npmcli/template-oss 4.23.0 → 4.23.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
GitHub takes the security of our software products and services seriously, including the open source code repositories managed through our GitHub organizations, such as [GitHub](https://github.com/GitHub).
|
|
2
2
|
|
|
3
|
-
If you believe you have found a security vulnerability in this GitHub-owned open source repository, you can report it to us in one of two ways.
|
|
3
|
+
If you believe you have found a security vulnerability in this GitHub-owned open source repository, you can report it to us in one of two ways.
|
|
4
4
|
|
|
5
5
|
If the vulnerability you have found is *not* [in scope for the GitHub Bug Bounty Program](https://bounty.github.com/#scope) or if you do not wish to be considered for a bounty reward, please report the issue to us directly through [opensource-security@github.com](mailto:opensource-security@github.com).
|
|
6
6
|
|
|
@@ -23,7 +23,7 @@ runs:
|
|
|
23
23
|
with:
|
|
24
24
|
result-encoding: string
|
|
25
25
|
script: |
|
|
26
|
-
const { repo: { owner, repo}, runId, serverUrl } = context
|
|
26
|
+
const { repo: { owner, repo}, runId, serverUrl } = context
|
|
27
27
|
const { JOB_NAME, SHA } = process.env
|
|
28
28
|
|
|
29
29
|
const job = await github.rest.actions.listJobsForWorkflowRun({
|
|
@@ -26,7 +26,7 @@ jobs:
|
|
|
26
26
|
id: flags
|
|
27
27
|
run: |
|
|
28
28
|
dependabot_dir="$\{{ steps.metadata.outputs.directory }}"
|
|
29
|
-
if [[ "$dependabot_dir" == "/" ]]; then
|
|
29
|
+
if [[ "$dependabot_dir" == "/" || "$dependabot_dir" == "/{{ releaseBranch }}" ]]; then
|
|
30
30
|
echo "workspace=-iwr" >> $GITHUB_OUTPUT
|
|
31
31
|
else
|
|
32
32
|
# strip leading slash from directory so it works as a
|
|
@@ -64,7 +64,7 @@ jobs:
|
|
|
64
64
|
run: |
|
|
65
65
|
git commit -am "$\{{ steps.apply.outputs.message }}"
|
|
66
66
|
git push
|
|
67
|
-
|
|
67
|
+
|
|
68
68
|
# If the previous step failed, then reset the commit and remove any workflow changes
|
|
69
69
|
# and attempt to commit and push again. This is helpful because we will have a commit
|
|
70
70
|
# with the correct prefix that we can then --amend with @npmcli/stafftools later.
|
|
@@ -98,4 +98,3 @@ jobs:
|
|
|
98
98
|
echo "This PR has a breaking change. Run 'npx -p @npmcli/stafftools gh template-oss-fix'"
|
|
99
99
|
echo "for more information on how to fix this with a BREAKING CHANGE footer."
|
|
100
100
|
exit 1
|
|
101
|
-
|
package/lib/util/dependabot.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const { name: NAME } = require('../../package.json')
|
|
2
2
|
const { minimatch } = require('minimatch')
|
|
3
3
|
|
|
4
|
-
const parseDependabotConfig = v => (typeof v === 'string' ? { strategy: v } : v ?? {})
|
|
4
|
+
const parseDependabotConfig = v => (typeof v === 'string' ? { strategy: v } : (v ?? {}))
|
|
5
5
|
|
|
6
6
|
module.exports = (config, defaultConfig, branches) => {
|
|
7
7
|
const { dependabot } = config
|