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 to 4.22.0 #269

Merged
merged 3 commits into from
May 4, 2024
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
2 changes: 1 addition & 1 deletion .github/actions/create-check/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
using: "composite"
steps:
- name: Get Workflow Job
uses: actions/github-script@v6
uses: actions/github-script@v7
id: workflow
env:
JOB_NAME: "${{ inputs.name }}"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Git User
run: |
git config --global user.email "[email protected]"
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: 20.x
check-latest: contains('20.x', '.x')
node-version: 22.x
check-latest: contains('22.x', '.x')
- name: Install Latest npm
uses: ./.github/actions/install-latest-npm
with:
Expand Down
29 changes: 23 additions & 6 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
- name: Setup Git User
Expand All @@ -44,11 +44,11 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
sha: ${{ inputs.check-sha }}
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: 20.x
check-latest: contains('20.x', '.x')
node-version: 22.x
check-latest: contains('22.x', '.x')
- name: Install Latest npm
uses: ./.github/actions/install-latest-npm
with:
Expand Down Expand Up @@ -80,19 +80,36 @@ jobs:
- name: macOS
os: macos-latest
shell: bash
- name: macOS
os: macos-13
shell: bash
node-version:
- 16.14.0
- 16.x
- 18.0.0
- 18.x
- 20.x
- 22.x
exclude:
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 16.14.0
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 16.x
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 18.0.0
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 18.x
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 20.x
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 22.x
runs-on: ${{ matrix.platform.os }}
defaults:
run:
shell: ${{ matrix.platform.shell }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
- name: Setup Git User
Expand All @@ -108,7 +125,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
sha: ${{ inputs.check-sha }}
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: ${{ matrix.node-version }}
Expand Down
29 changes: 23 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ jobs:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Git User
run: |
git config --global user.email "[email protected]"
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: 20.x
check-latest: contains('20.x', '.x')
node-version: 22.x
check-latest: contains('22.x', '.x')
- name: Install Latest npm
uses: ./.github/actions/install-latest-npm
with:
Expand All @@ -57,25 +57,42 @@ jobs:
- name: macOS
os: macos-latest
shell: bash
- name: macOS
os: macos-13
shell: bash
node-version:
- 16.14.0
- 16.x
- 18.0.0
- 18.x
- 20.x
- 22.x
exclude:
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 16.14.0
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 16.x
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 18.0.0
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 18.x
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 20.x
- platform: { name: macOS, os: macos-13, shell: bash }
node-version: 22.x
runs-on: ${{ matrix.platform.os }}
defaults:
run:
shell: ${{ matrix.platform.shell }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Git User
run: |
git config --global user.email "[email protected]"
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: ${{ matrix.node-version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
security-events: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Git User
run: |
git config --global user.email "[email protected]"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/post-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ jobs:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
- name: Setup Git User
run: |
git config --global user.email "[email protected]"
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: 20.x
check-latest: contains('20.x', '.x')
node-version: 22.x
check-latest: contains('22.x', '.x')
- name: Install Latest npm
uses: ./.github/actions/install-latest-npm
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ jobs:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Git User
run: |
git config --global user.email "[email protected]"
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: 20.x
check-latest: contains('20.x', '.x')
node-version: 22.x
check-latest: contains('22.x', '.x')
- name: Install Latest npm
uses: ./.github/actions/install-latest-npm
with:
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/release-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ jobs:
id-token: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ fromJSON(inputs.releases)[0].tagName }}
- name: Setup Git User
run: |
git config --global user.email "[email protected]"
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: 20.x
check-latest: contains('20.x', '.x')
node-version: 22.x
check-latest: contains('22.x', '.x')
- name: Install Latest npm
uses: ./.github/actions/install-latest-npm
with:
Expand All @@ -58,17 +58,10 @@ jobs:
run: |
EXIT_CODE=0

function each_release {
if npm publish --provenance --tag="$1"; then
echo 0
else
echo 1
fi
}

for release in $(echo $RELEASES | jq -r '.[] | @base64'); do
PUBLISH_TAG=$(echo "$release" | base64 --decode | jq -r .publishTag)
STATUS=$(each_release "$PUBLISH_TAG")
npm publish --provenance --tag="$PUBLISH_TAG"
STATUS=$?
if [[ "$STATUS" -eq 1 ]]; then
EXIT_CODE=$STATUS
fi
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ jobs:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Git User
run: |
git config --global user.email "[email protected]"
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: 20.x
check-latest: contains('20.x', '.x')
node-version: 22.x
check-latest: contains('22.x', '.x')
- name: Install Latest npm
uses: ./.github/actions/install-latest-npm
with:
Expand All @@ -54,7 +54,7 @@ jobs:
run: npx --offline template-oss-release-please --branch="${{ github.ref_name }}" --backport="" --defaultTag="latest"
- name: Create Release Manager Comment Text
if: steps.release.outputs.pr-number
uses: actions/github-script@v6
uses: actions/github-script@v7
id: comment-text
with:
result-encoding: string
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
shell: bash
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ needs.release.outputs.pr-branch }}
Expand All @@ -116,11 +116,11 @@ jobs:
git config --global user.email "[email protected]"
git config --global user.name "npm CLI robot"
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
id: node
with:
node-version: 20.x
check-latest: contains('20.x', '.x')
node-version: 22.x
check-latest: contains('22.x', '.x')
- name: Install Latest npm
uses: ./.github/actions/install-latest-npm
with:
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
steps:
- name: Create Release PR Comment Text
id: comment-text
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
RELEASES: ${{ needs.release.outputs.releases }}
with:
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:
- name: Create Release PR Comment Text
id: comment-text
if: steps.found-comment.outputs.comment-id
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
RESULT: ${{ steps.conclusion.outputs.result }}
BODY: ${{ steps.found-comment.outputs.comment-body }}
Expand Down
2 changes: 1 addition & 1 deletion lib/content/read.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function readStream (cache, integrity, opts = {}) {
module.exports.copy = copy

function copy (cache, integrity, dest) {
return withContentSri(cache, integrity, (cpath, sri) => {
return withContentSri(cache, integrity, (cpath) => {
return fs.copyFile(cpath, dest)
})
}
Expand Down
2 changes: 1 addition & 1 deletion lib/content/write.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ async function makeTmp (cache, opts) {
}
}

async function moveToDestination (tmp, cache, sri, opts) {
async function moveToDestination (tmp, cache, sri) {
const destination = contentPath(cache, sri)
const destDir = path.dirname(destination)
if (moveOperations.has(destination)) {
Expand Down
2 changes: 1 addition & 1 deletion lib/entry-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ async function bucketEntries (bucket, filter) {
return _bucketEntries(data, filter)
}

function _bucketEntries (data, filter) {
function _bucketEntries (data) {
const entries = []
data.split('\n').forEach((entry) => {
if (!entry) {
Expand Down
6 changes: 3 additions & 3 deletions lib/verify.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ async function verify (cache, opts) {
return stats
}

async function markStartTime (cache, opts) {
async function markStartTime () {
return { startTime: new Date() }
}

async function markEndTime (cache, opts) {
async function markEndTime () {
return { endTime: new Date() }
}

Expand Down Expand Up @@ -213,7 +213,7 @@ async function rebuildIndex (cache, opts) {
return stats
}

async function rebuildBucket (cache, bucket, stats, opts) {
async function rebuildBucket (cache, bucket, stats) {
await truncate(bucket._path)
// This needs to be serialized because cacache explicitly
// lets very racy bucket conflicts clobber each other.
Expand Down
Loading
Loading