Merge remote-tracking branch 'bp/main'

Author: waitingsong

.env

@@ -0,0 +1,21 @@
+
+# OTEL_EXPORTER_OTLP_ENDPOINT="http://127.0.0.1:4317"
+
+# POSTGRES_HOST="127.0.0.1"
+# POSTGRES_PORT=5432
+# POSTGRES_DB=db_ci_test
+# POSTGRES_USER=postgres
+# POSTGRES_PASSWORD=postgres
+
+# PGMQ_HOST="127.0.0.1"
+# PGMQ_PORT=5432
+# PGMQ_DB=postgres
+# PGMQ_USER=postgres
+# PGMQ_PASSWORD=postgres
+
+# PARADEDB_HOST="127.0.0.1"
+# PARADEDB_PORT=5432
+# PARADEDB_DB=db_ci_test
+# PARADEDB_USER=postgres
+# PARADEDB_PASSWORD=postgres
+

.githooks/init-repo.sh

@@ -25,9 +25,10 @@ if [ -z "$CI" ]; then
   git config --local remote.origin.prune true
   git config --local remote.origin.tagopt --tags
   git config --local remote.pushdefault origin
+  git config --local rerere.enabled true
 fi;
 
-echo It may going for a long time. Plese wait...
+echo It may going for a long time. Please wait...
 .githooks/gen-file-from-example.js
 
 lerna list

.githooks/init.config.ts

@@ -17,11 +17,14 @@ export const globalConfigFileArr: string[] = [
   '.vscode/launch.json.example',
   '.vscode/settings.json.example',
   '.vscode/ci.code-snippets.example',
+  '.vscode/common.code-snippets.example',
+  '.vscode/md.code-snippets.example',
   '.vscode/midway.code-snippets.example',
   '.vscode/promise.code-snippets.example',
   './tsconfig.base.json',
   './tsconfig.eslint.json',
   // './rollup.config.js',
   './bin-hashbang.js',
+  './.env',
 ]
 

.githooks/set-scripts-executable-now.sh

@@ -4,7 +4,7 @@ set +e
 dirs=".scripts .github src bin"
 
 for dir in $dirs; do
-  [[ -f "$dir" ]] && find $dir -type f \( -iname "*.sh" -o -iname "*.mjs" -o -iname "*.mts" \) -print0 | xargs -0II chmod a+x I
+  [[ -d "$dir" ]] && find $dir -type f \( -iname "*.sh" -o -iname "*.mjs" -o -iname "*.mts" \) -print0 | xargs -0II chmod a+x I
 done
 
 set -e

.githooks/set-scripts-executable.sh

@@ -4,7 +4,7 @@ set +e
 dirs=".scripts .github"
 
 for dir in $dirs; do
-  [[ -f "$dir" ]] && find $dir -type f \( -iname "*.sh" -o -iname "*.mjs" -o -iname "*.mts" \) -print0 | xargs -0II git update-index --ignore-missing --chmod=+x I
+  [[ -d "$dir" ]] && 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

.github/workflows/nodejs-win.yml

@@ -84,7 +84,7 @@ jobs:
       #   env:
       #     CI: true
 
-      - name: Testing
+      - name: Coverage
         shell: bash
         run: |
           export cwd=`pwd`
@@ -94,17 +94,6 @@ jobs:
           npm run ci
         env:
           CI: true
-          # use `localhost` if running the job on the VM
-          # use `postgres` if running the job on a container
-          POSTGRES_HOST: postgres
-          POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
-          POSTGRES_DB: db_ci_test
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          PGPASSWORD: postgres
-          # redis
-          REDIS_HOST: redis
-          REDIS_PORT: 6379
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4

.github/workflows/nodejs.yml

@@ -41,7 +41,6 @@ jobs:
 
       - name: Prepare
         run: |
-          pwd
           uname -a
           export DEBIAN_FRONTEND=noninteractive
           apt-get update -qq --yes > /dev/null
@@ -57,22 +56,21 @@ jobs:
           locale-gen
           locale -a
           netstat -tunpl
+          dig jaeger
           export cwd=`pwd`
           git config --global --add safe.directory $cwd
 
       - name: Install Dependencies
         timeout-minutes: 15
         run: |
-          # DO NOT execute: npm config set unsafe-perm=true
           export cwd=`pwd`
           npm i --no-audit -g c8 lerna madge rollup tsx zx
-          npm i
+          npm i --no-audit
         env:
           CI: true
 
       - name: Build
         run: |
-          pwd
           whoami
           export cwd=`pwd`
           . .scripts/ci/ci-env.sh
@@ -103,4 +101,6 @@ jobs:
     #       POSTGRES_PASSWORD: postgres
     #     # needed because the postgres container does not provide a healthcheck
     #     options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
+          # otel
+          OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4317
+          # aliyun

.gitignore

@@ -1,3 +1,4 @@
+.env
 .nx
 .ssh/
 dbconfig.json

.mocharc.yml

@@ -6,6 +6,7 @@ node-option:
   - no-warnings
   - "loader=ts-node/esm"
   - "enable-source-maps"
+  - "env-file=.env"
 require:
   - tsconfig-paths/register.js
   - test/setup.ts

.nycrc.json

@@ -20,5 +20,6 @@
     "json",
     "text-summary"
   ],
+  "skip-full": true,
   "all": true
 }