From 5311602647a44e64559fef5cae600d3748edaea9 Mon Sep 17 00:00:00 2001 From: Guenter Sandner Date: Sat, 22 Aug 2026 15:48:31 +0200 Subject: [PATCH 1/2] Upgraded dependencies --- package.json | 2 +- tools/benchmark-drivers/package.json | 2 +- tools/benchmark-drivers/yarn.lock | 12 ++++++------ yarn.lock | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 6d7b3328..f0d3b4c7 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/tools/benchmark-drivers/package.json b/tools/benchmark-drivers/package.json index 66d77487..28ed44dd 100644 --- a/tools/benchmark-drivers/package.json +++ b/tools/benchmark-drivers/package.json @@ -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", diff --git a/tools/benchmark-drivers/yarn.lock b/tools/benchmark-drivers/yarn.lock index 6642f044..243fc717 100644 --- a/tools/benchmark-drivers/yarn.lock +++ b/tools/benchmark-drivers/yarn.lock @@ -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" @@ -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== diff --git a/yarn.lock b/yarn.lock index e7af0dec..fada913f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" From 15c9cd9031a272cc71735bff9a6d679fd420f5b5 Mon Sep 17 00:00:00 2001 From: Guenter Sandner Date: Sat, 22 Aug 2026 15:58:12 +0200 Subject: [PATCH 2/2] fix: handle skipped/neutral CI checks in maintenance.sh gh pr checks --watch returns non-zero when any check is not 'pass', including skipped/neutral checks like create-release and musl that only run on tag events. This caused the maintenance script to incorrectly report CI failure. Now we ignore the exit code of 'gh pr checks --watch' and instead check for actual failures via the GitHub API (statusCheckRollup with conclusion=failure). --- tools/bin/maintenance.sh | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/tools/bin/maintenance.sh b/tools/bin/maintenance.sh index 04301506..1d569357 100755 --- a/tools/bin/maintenance.sh +++ b/tools/bin/maintenance.sh @@ -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