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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"devDependencies": {
"@eslint/js": "^10.0.1",
"eslint": "^10.8.1",
"eslint": "^10.9.0",
"globals": "^17.11.0",
"mocha": "11.8.0",
"nyc": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tools/benchmark-drivers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"license": "ISC",
"description": "",
"dependencies": {
"@homeofthings/sqlite3": "^7.0.4",
"@homeofthings/sqlite3": "^7.0.5",
"better-sqlite3": "^13.0.3",
"cli-color": "^2.0.4",
"fs-extra": "^11.4.0",
Expand Down
12 changes: 6 additions & 6 deletions tools/benchmark-drivers/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# yarn lockfile v1


"@homeofthings/sqlite3@^7.0.4":
version "7.0.4"
resolved "https://registry.yarnpkg.com/@homeofthings/sqlite3/-/sqlite3-7.0.4.tgz#1044bfed96d2959e95d631b5093f9d4ebc3d0b4a"
integrity sha512-RrIhXFT/kXW6YLaLsNGN2WDlpIJqq9jUo+Nvfjzjut4CEIe63z3zuKGU2UA+A8+/DoyucIxLGZXwVcn6dFqbQg==
"@homeofthings/sqlite3@^7.0.5":
version "7.0.5"
resolved "https://registry.yarnpkg.com/@homeofthings/sqlite3/-/sqlite3-7.0.5.tgz#85d523237067589a857b1294581f85e398e18bdb"
integrity sha512-GFNgQFSfQH527pdqrBYsrlAIUeAoBkaQMetNraVpCKCA8DwHy+H6fgOij4BDoMaxlL8a5bJ1GLbsg2r8lyDc9g==
dependencies:
node-addon-api "^8.9.0"
node-addon-api "^8.9.2"
node-gyp-build "^4.8.4"
optionalDependencies:
node-gyp "13.x"
Expand Down Expand Up @@ -203,7 +203,7 @@ next-tick@^1.1.0:
resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"
integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==

node-addon-api@^8.0.0, node-addon-api@^8.9.0:
node-addon-api@^8.0.0, node-addon-api@^8.9.2:
version "8.9.2"
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.9.2.tgz#db7ac94a13ffd9b55e6cb04584bd5ef8e1d74b18"
integrity sha512-VijLXbi3UACN69I0JVXJsX4tjACjNoQDgv2gTF6sx2wWEi8tkSg2eX8p5gSIFi8z2+DL3oHmY6OyKce38SDolg==
Expand Down
20 changes: 17 additions & 3 deletions tools/bin/maintenance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,23 @@ step3_merge_pr() {

log "Waiting for CI checks on PR #$pr_number..."

# Wait for checks to complete
if ! gh pr checks "$pr_number" --repo "$GH_REPO" --watch 2>/dev/null; then
echo "ERROR: CI checks failed for PR #$pr_number." >&2
# Wait for all checks to complete.
# Note: gh pr checks --watch returns non-zero if any check is not "pass",
# including skipped/neutral checks (e.g., create-release, musl on PR events).
# We ignore its exit code and instead check for actual failures via the API.
gh pr checks "$pr_number" --repo "$GH_REPO" --watch 2>/dev/null || true

# Check for actual failures using the GitHub API (more reliable than
# parsing gh pr checks output, which treats skipped as non-passing)
local failed_checks
failed_checks="$(gh pr view "$pr_number" --repo "$GH_REPO" \
--json statusCheckRollup \
--jq '.statusCheckRollup[] | select(.conclusion == "failure") | .name' \
2>/dev/null || true)"

if [[ -n "$failed_checks" ]]; then
echo "ERROR: CI checks failed for PR #$pr_number:" >&2
echo "$failed_checks" >&2
echo " Fix the issues and re-run this script, or merge manually." >&2
exit "$EXIT_GENERAL_ERROR"
fi
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -670,10 +670,10 @@ eslint-visitor-keys@^5.0.1:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz#9e3c9489697824d2d4ce3a8ad12628f91e9f59be"
integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==

eslint@^10.8.1:
version "10.8.1"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.8.1.tgz#fb37d514c19b6dd5b2d6b70169fd26fddfa97967"
integrity sha512-wqA7W2jbsC/BnV9Iv1UZpKVFkO1AdNoSmYW8NWG4HNOBbkAMvIqDZ27pI2f07dqn583NcIC44ckjAcOXDL1QbQ==
eslint@^10.9.0:
version "10.9.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.9.0.tgz#3d86068a06c6c78161a4062e69874d38f59d498b"
integrity sha512-5KeEOJZBfEVA47boFiBsf+6MmmJpffM7qEBg4pLla2e4nlKgdKlqCW0oSLOGsT8Wl5uCGJptLV1bkaiShj90Gw==
dependencies:
"@eslint-community/eslint-utils" "^4.8.0"
"@eslint-community/regexpp" "^4.12.2"
Expand Down