Skip to content

Commit b503ad4

Browse files
dependabot[bot]npm-cli-botnlf
authored
chore: bump @npmcli/template-oss from 4.6.2 to 4.7.1 (#238)
* chore: bump @npmcli/template-oss from 4.6.2 to 4.7.1 Bumps [@npmcli/template-oss](https://github.com/npm/template-oss) from 4.6.2 to 4.7.1. - [Release notes](https://github.com/npm/template-oss/releases) - [Changelog](https://github.com/npm/template-oss/blob/main/CHANGELOG.md) - [Commits](npm/template-oss@v4.6.2...v4.7.1) --- updated-dependencies: - dependency-name: "@npmcli/template-oss" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore!: postinstall for dependabot template-oss PR * chore: postinstall for @npmcli/template-oss Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: npm CLI robot <[email protected]> Co-authored-by: nlf <[email protected]>
1 parent 854fad1 commit b503ad4

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

.github/workflows/ci-release.yml

+12-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
name: CI - Release
44

55
on:
6+
workflow_dispatch:
7+
inputs:
8+
ref:
9+
required: true
10+
type: string
11+
default: main
612
workflow_call:
713
inputs:
814
ref:
@@ -23,7 +29,7 @@ jobs:
2329
steps:
2430
- name: Get Workflow Job
2531
uses: actions/github-script@v6
26-
32+
if: inputs.check-sha
2733
id: check-output
2834
env:
2935
JOB_NAME: "Lint All"
@@ -57,7 +63,7 @@ jobs:
5763
- name: Create Check
5864
uses: LouisBrunner/[email protected]
5965
id: check
60-
66+
if: inputs.check-sha
6167
with:
6268
token: ${{ secrets.GITHUB_TOKEN }}
6369
status: in_progress
@@ -88,7 +94,7 @@ jobs:
8894
run: npm run postlint --ignore-scripts
8995
- name: Conclude Check
9096
uses: LouisBrunner/[email protected]
91-
if: always()
97+
if: steps.check.outputs.check_id && always()
9298
with:
9399
token: ${{ secrets.GITHUB_TOKEN }}
94100
conclusion: ${{ job.status }}
@@ -121,7 +127,7 @@ jobs:
121127
steps:
122128
- name: Get Workflow Job
123129
uses: actions/github-script@v6
124-
130+
if: inputs.check-sha
125131
id: check-output
126132
env:
127133
JOB_NAME: "Test All"
@@ -155,7 +161,7 @@ jobs:
155161
- name: Create Check
156162
uses: LouisBrunner/[email protected]
157163
id: check
158-
164+
if: inputs.check-sha
159165
with:
160166
token: ${{ secrets.GITHUB_TOKEN }}
161167
status: in_progress
@@ -200,7 +206,7 @@ jobs:
200206
run: npm test --ignore-scripts
201207
- name: Conclude Check
202208
uses: LouisBrunner/[email protected]
203-
if: always()
209+
if: steps.check.outputs.check_id && always()
204210
with:
205211
token: ${{ secrets.GITHUB_TOKEN }}
206212
conclusion: ${{ job.status }}

.github/workflows/post-dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
if [[ "${{ steps.metadata.outputs.update-type }}" == "version-update:semver-major" ]]; then
7070
prefix='feat!'
7171
else
72-
prefix='chore!'
72+
prefix='chore'
7373
fi
7474
echo "::set-output name=message::$prefix: postinstall for dependabot template-oss PR"
7575

.github/workflows/release.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
branches:
99
- main
1010
- latest
11+
- release/v*
1112

1213
permissions:
1314
contents: write
@@ -88,7 +89,7 @@ jobs:
8889
return commentId
8990
- name: Get Workflow Job
9091
uses: actions/github-script@v6
91-
if: steps.release.outputs.pr-number
92+
if: steps.release.outputs.pr-sha
9293
id: check-output
9394
env:
9495
JOB_NAME: "Release"
@@ -122,7 +123,7 @@ jobs:
122123
- name: Create Check
123124
uses: LouisBrunner/[email protected]
124125
id: check
125-
if: steps.release.outputs.pr-number
126+
if: steps.release.outputs.pr-sha
126127
with:
127128
token: ${{ secrets.GITHUB_TOKEN }}
128129
status: in_progress
@@ -179,7 +180,7 @@ jobs:
179180
echo "::set-output name=sha::$(git rev-parse HEAD)"
180181
- name: Get Workflow Job
181182
uses: actions/github-script@v6
182-
183+
if: steps.commit.outputs.sha
183184
id: check-output
184185
env:
185186
JOB_NAME: "Update - Release"
@@ -213,7 +214,7 @@ jobs:
213214
- name: Create Check
214215
uses: LouisBrunner/[email protected]
215216
id: check
216-
217+
if: steps.commit.outputs.sha
217218
with:
218219
token: ${{ secrets.GITHUB_TOKEN }}
219220
status: in_progress
@@ -222,7 +223,7 @@ jobs:
222223
output: ${{ steps.check-output.outputs.result }}
223224
- name: Conclude Check
224225
uses: LouisBrunner/[email protected]
225-
if: always()
226+
if: needs.release.outputs.check-id && always()
226227
with:
227228
token: ${{ secrets.GITHUB_TOKEN }}
228229
conclusion: ${{ job.status }}
@@ -260,7 +261,7 @@ jobs:
260261
echo "::set-output name=result::$result"
261262
- name: Conclude Check
262263
uses: LouisBrunner/[email protected]
263-
if: always()
264+
if: needs.update.outputs.check-id && always()
264265
with:
265266
token: ${{ secrets.GITHUB_TOKEN }}
266267
conclusion: ${{ steps.needs-result.outputs.result }}

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"devDependencies": {
2828
"@npmcli/arborist": "^6.0.0 || ^6.0.0-pre.0",
2929
"@npmcli/eslint-config": "^4.0.0",
30-
"@npmcli/template-oss": "4.6.2",
30+
"@npmcli/template-oss": "4.7.1",
3131
"hosted-git-info": "^6.0.0",
3232
"mutate-fs": "^2.1.1",
3333
"nock": "^13.2.4",
@@ -71,7 +71,7 @@
7171
},
7272
"templateOSS": {
7373
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
74-
"version": "4.6.2",
74+
"version": "4.7.1",
7575
"windowsCI": false
7676
}
7777
}

0 commit comments

Comments
 (0)