Merge remote-tracking branch 'bp/main'

waitingsong · May 17, 2024 · cbf0915 · cbf0915
2 parents fd7eecb + 7f20a51
commit cbf0915
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.githooks/set-scripts-executable-now.sh b/.githooks/set-scripts-executable-now.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set +e
+
+dirs=".scripts .github src bin"
+
+for dir in $dirs; do
+  find $dir -type f \( -iname "*.sh" -o -iname "*.mjs" -o -iname "*.mts" \) -print0 | xargs -0II chmod a+x I
+done
+
+set -e
+
diff --git a/.githooks/set-scripts-executable.sh b/.githooks/set-scripts-executable.sh
@@ -4,9 +4,7 @@ set +e
 dirs=".scripts .github"
 
 for dir in $dirs; do
-  find $dir -type f -iname "*.sh" -print0 | xargs -0II git update-index --ignore-missing --chmod=+x I
-  find $dir -type f -iname "*.mjs" -print0 | xargs -0II git update-index --ignore-missing --chmod=+x I
-  find $dir -type f -iname "*.mts" -print0 | xargs -0II git update-index --ignore-missing --chmod=+x I
+  find $dir -type f \( -iname "*.sh" -o -iname "*.mjs" -o -iname "*.mts" \) -print0 | xargs -0II git update-index --ignore-missing --chmod=+x I
 done
 
 find .githooks -type f -print0 | xargs -0II git update-index --ignore-missing --chmod=+x I

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "@types/mocha": "10",
     "@types/node": "20",
     "@waiting/eslint-config": "^10.25.1",
-    "@waiting/shared-core": "^23.8.0",
+    "@waiting/shared-core": "^23.9.0",
     "@waiting/shared-types": "^23.6.0",
     "autocannon": "7",
     "coveralls": "3",
@@ -23,7 +23,7 @@
     "mocha": "10",
     "mocha-lcov-reporter": "1",
     "mwtsc": "^1.8.1",
-    "nx": "18",
+    "nx": "19",
     "swagger-ui-dist": "^5.17.6",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.8",