Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
name: CI - Release

on:
workflow_dispatch:
inputs:
ref:
required: true
type: string
default: main
workflow_call:
inputs:
ref:
Expand All @@ -23,7 +29,7 @@ jobs:
steps:
- name: Get Workflow Job
uses: actions/github-script@v6

if: inputs.check-sha
id: check-output
env:
JOB_NAME: "Lint All"
Expand Down Expand Up @@ -57,7 +63,7 @@ jobs:
- name: Create Check
uses: LouisBrunner/checks-action@v1.3.1
id: check

if: inputs.check-sha
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: in_progress
Expand Down Expand Up @@ -88,7 +94,7 @@ jobs:
run: npm run postlint --ignore-scripts
- name: Conclude Check
uses: LouisBrunner/checks-action@v1.3.1
if: always()
if: steps.check.outputs.check_id && always()
with:
token: ${{ secrets.GITHUB_TOKEN }}
conclusion: ${{ job.status }}
Expand Down Expand Up @@ -124,7 +130,7 @@ jobs:
steps:
- name: Get Workflow Job
uses: actions/github-script@v6

if: inputs.check-sha
id: check-output
env:
JOB_NAME: "Test All"
Expand Down Expand Up @@ -158,7 +164,7 @@ jobs:
- name: Create Check
uses: LouisBrunner/checks-action@v1.3.1
id: check

if: inputs.check-sha
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: in_progress
Expand Down Expand Up @@ -203,7 +209,7 @@ jobs:
run: npm test --ignore-scripts
- name: Conclude Check
uses: LouisBrunner/checks-action@v1.3.1
if: always()
if: steps.check.outputs.check_id && always()
with:
token: ${{ secrets.GITHUB_TOKEN }}
conclusion: ${{ job.status }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
if [[ "${{ steps.metadata.outputs.update-type }}" == "version-update:semver-major" ]]; then
prefix='feat!'
else
prefix='chore!'
prefix='chore'
fi
echo "::set-output name=message::$prefix: postinstall for dependabot template-oss PR"

Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
branches:
- main
- latest
- release/v*

permissions:
contents: write
Expand Down Expand Up @@ -88,7 +89,7 @@ jobs:
return commentId
- name: Get Workflow Job
uses: actions/github-script@v6
if: steps.release.outputs.pr-number
if: steps.release.outputs.pr-sha
id: check-output
env:
JOB_NAME: "Release"
Expand Down Expand Up @@ -122,7 +123,7 @@ jobs:
- name: Create Check
uses: LouisBrunner/checks-action@v1.3.1
id: check
if: steps.release.outputs.pr-number
if: steps.release.outputs.pr-sha
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: in_progress
Expand Down Expand Up @@ -179,7 +180,7 @@ jobs:
echo "::set-output name=sha::$(git rev-parse HEAD)"
- name: Get Workflow Job
uses: actions/github-script@v6

if: steps.commit.outputs.sha
id: check-output
env:
JOB_NAME: "Update - Release"
Expand Down Expand Up @@ -213,7 +214,7 @@ jobs:
- name: Create Check
uses: LouisBrunner/checks-action@v1.3.1
id: check

if: steps.commit.outputs.sha
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: in_progress
Expand All @@ -222,7 +223,7 @@ jobs:
output: ${{ steps.check-output.outputs.result }}
- name: Conclude Check
uses: LouisBrunner/checks-action@v1.3.1
if: always()
if: needs.release.outputs.check-id && always()
with:
token: ${{ secrets.GITHUB_TOKEN }}
conclusion: ${{ job.status }}
Expand Down Expand Up @@ -260,7 +261,7 @@ jobs:
echo "::set-output name=result::$result"
- name: Conclude Check
uses: LouisBrunner/checks-action@v1.3.1
if: always()
if: needs.update.outputs.check-id && always()
with:
token: ${{ secrets.GITHUB_TOKEN }}
conclusion: ${{ steps.needs-result.outputs.result }}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"devDependencies": {
"@npmcli/eslint-config": "^4.0.0",
"@npmcli/template-oss": "4.6.1",
"@npmcli/template-oss": "4.7.1",
"minipass": "^3.1.6",
"require-inject": "^1.4.4",
"tap": "^16.0.1"
Expand All @@ -42,7 +42,7 @@
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.6.1"
"version": "4.7.1"
},
"tap": {
"nyc-arg": [
Expand Down