diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b9770e23a2e..f908a22530a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,7 +8,7 @@ updates: interval: monthly commit-message: prefix: meta - open-pull-requests-limit: ${{secrets.OPEN_PR_LIMIT}} + open-pull-requests-limit: 0 - package-ecosystem: npm directory: /tools/eslint @@ -16,7 +16,7 @@ updates: interval: monthly commit-message: prefix: tools - open-pull-requests-limit: ${{secrets.OPEN_PR_LIMIT}} + open-pull-requests-limit: 0 groups: eslint: applies-to: version-updates @@ -29,7 +29,7 @@ updates: interval: monthly commit-message: prefix: tools - open-pull-requests-limit: ${{secrets.OPEN_PR_LIMIT}} + open-pull-requests-limit: 0 groups: lint-md: applies-to: version-updates diff --git a/doc/api/fs.md b/doc/api/fs.md index 78618afa43c..a28a923101f 100644 --- a/doc/api/fs.md +++ b/doc/api/fs.md @@ -21,16 +21,6 @@ import * as fs from 'node:fs/promises'; const fs = require('node:fs/promises'); ``` -To use the callback and sync APIs: - -```mjs -import * as fs from 'node:fs'; -``` - -```cjs -const fs = require('node:fs'); -``` - All file system operations have synchronous, callback, and promise-based forms, and are accessible using both CommonJS syntax and ES6 Modules (ESM). diff --git a/tools/actions/commit-queue.sh b/tools/actions/commit-queue.sh index 3b3138053cb..1f2daf2fd26 100755 --- a/tools/actions/commit-queue.sh +++ b/tools/actions/commit-queue.sh @@ -82,18 +82,11 @@ for pr in "$@"; do fi else # If there's only one commit, we can use the Squash and Merge feature from GitHub. - # TODO: use `gh pr merge` when the GitHub CLI allows to customize the commit title (https://github.com/cli/cli/issues/1023). commit_title=$(git log -1 --pretty='format:%s') commit_body=$(git log -1 --pretty='format:%b') commit_head=$(grep 'Fetched commits as' output | cut -d. -f3 | xargs git rev-parse) - jq -n \ - --arg title "${commit_title}" \ - --arg body "${commit_body}" \ - --arg head "${commit_head}" \ - '{merge_method:"squash",commit_title:$title,commit_message:$body,sha:$head}' > output.json - cat output.json - if ! gh api -X PUT "repos/${OWNER}/${REPOSITORY}/pulls/${pr}/merge" --input output.json > output; then + if ! gh pr merge "$pr" --squash --body "$commit_body" --subject "$commit_title" --match-head-commit "$commit_head" > output; then commit_queue_failed "$pr" continue fi @@ -102,7 +95,6 @@ for pr in "$@"; do commit_queue_failed "$pr" continue fi - rm output.json fi rm output