Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump @npmcli/template-oss from 4.17.0 to 4.18.1 #623

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
52 changes: 0 additions & 52 deletions .github/settings.yml

This file was deleted.

5 changes: 4 additions & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ jobs:
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
id: node
with:
node-version: 18.x
node-version: 20.x
check-latest: contains('20.x', '.x')

- name: Remove Template-OSS
if: matrix && matrix.node-version == '6.17.1'
run: |
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
ref:
required: true
type: string
default: main
default: release/v5
workflow_call:
inputs:
ref:
Expand Down Expand Up @@ -80,8 +80,11 @@ jobs:
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
id: node
with:
node-version: 18.x
node-version: 20.x
check-latest: contains('20.x', '.x')

- name: Remove Template-OSS
if: matrix && matrix.node-version == '6.17.1'
run: |
Expand Down Expand Up @@ -115,7 +118,7 @@ jobs:
shell: bash
node-version:
- 6.17.1
- 18.x
- 20.x
runs-on: ${{ matrix.platform.os }}
defaults:
run:
Expand Down Expand Up @@ -174,8 +177,11 @@ jobs:
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
id: node
with:
node-version: ${{ matrix.node-version }}
check-latest: contains(matrix.node-version, '.x')

- name: Remove Template-OSS
if: matrix && matrix.node-version == '6.17.1'
run: |
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
push:
branches:
- main
- latest
- release/v*
schedule:
# "At 09:00 UTC (02:00 PT) on Monday" https://crontab.guru/#0_9_*_*_1
Expand All @@ -31,8 +30,11 @@ jobs:
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
id: node
with:
node-version: 18.x
node-version: 20.x
check-latest: contains('20.x', '.x')

- name: Remove Template-OSS
if: matrix && matrix.node-version == '6.17.1'
run: |
Expand All @@ -59,7 +61,7 @@ jobs:
shell: bash
node-version:
- 6.17.1
- 18.x
- 20.x
runs-on: ${{ matrix.platform.os }}
defaults:
run:
Expand All @@ -73,8 +75,11 @@ jobs:
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
id: node
with:
node-version: ${{ matrix.node-version }}
check-latest: contains(matrix.node-version, '.x')

- name: Remove Template-OSS
if: matrix && matrix.node-version == '6.17.1'
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ on:
push:
branches:
- main
- latest
- release/v*
pull_request:
branches:
- main
- latest
- release/v*
schedule:
# "At 10:00 UTC (03:00 PT) on Monday" https://crontab.guru/#0_10_*_*_1
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ jobs:
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
id: node
with:
node-version: 18.x
node-version: 20.x
check-latest: contains('20.x', '.x')

- name: Remove Template-OSS
if: matrix && matrix.node-version == '6.17.1'
run: |
Expand All @@ -50,4 +53,4 @@ jobs:
env:
PR_TITLE: ${{ github.event.pull_request.title }}
run: |
echo '$PR_TITLE' | npx --offline commitlint -V
echo "$PR_TITLE" | npx --offline commitlint -V
52 changes: 23 additions & 29 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
push:
branches:
- main
- latest
- release/v*

permissions:
Expand Down Expand Up @@ -44,8 +43,11 @@ jobs:
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
id: node
with:
node-version: 18.x
node-version: 20.x
check-latest: contains('20.x', '.x')

- name: Remove Template-OSS
if: matrix && matrix.node-version == '6.17.1'
run: |
Expand Down Expand Up @@ -160,8 +162,11 @@ jobs:
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
id: node
with:
node-version: 18.x
node-version: 20.x
check-latest: contains('20.x', '.x')

- name: Remove Template-OSS
if: matrix && matrix.node-version == '6.17.1'
run: |
Expand All @@ -177,7 +182,7 @@ jobs:
RELEASE_COMMENT_ID: ${{ needs.release.outputs.comment-id }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm exec --offline -- template-oss-release-manager --lockfile=false --publish=false
npm exec --offline -- template-oss-release-manager --lockfile=false --publish=true
npm run rp-pull-request --ignore-scripts --if-present
- name: Commit
id: commit
Expand Down Expand Up @@ -326,37 +331,26 @@ jobs:
defaults:
run:
shell: bash
permissions:
deployments: write
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v3
with:
ref: ${{ fromJSON(needs.release.outputs.release).tagName }}
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.x
- name: View in Registry
- name: Install npm@latest
run: |
EXIT_CODE=0

function is_published {
if npm view "$@" --loglevel=error > /dev/null; then
echo 0
else
echo 1
fi
}

for release in $(echo '${{ needs.release.outputs.releases }}' | jq -r '.[] | @base64'); do
name=$(echo "$release" | base64 --decode | jq -r .pkgName)
version=$(echo "$release" | base64 --decode | jq -r .version)
spec="$name@$version"
status=$(is_published "$spec")
if [[ "$status" -eq 1 ]]; then
echo "$spec ERROR"
EXIT_CODE=$status
else
echo "$spec OK"
fi
done

exit $EXIT_CODE
npm i --prefer-online --no-fund --no-audit -g npm@latest
npm config set '//registry.npmjs.org/:_authToken'=\${PUBLISH_TOKEN}
- name: Publish
env:
PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
run: npm publish --provenance --tag=next-5

post-release-integration:
needs: [ release, release-integration ]
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"posttest": "npm run lint"
},
"devDependencies": {
"@npmcli/template-oss": "4.17.0",
"@npmcli/template-oss": "4.19.0",
"tap": "^12.7.0"
},
"license": "ISC",
Expand All @@ -33,6 +33,6 @@
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"content": "./scripts/template-oss",
"version": "4.17.0"
"version": "4.19.0"
}
}
7 changes: 3 additions & 4 deletions scripts/template-oss/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ module.exports = {
eslint: false,
dependabot: false,
oldNode: OLD_NODE,
ciVersions: [
OLD_NODE,
'latest',
],
ciVersions: [OLD_NODE],
backport: 5,
publish: true,
allowPaths: [
'/range.bnf',
'/semver.js',
Expand Down