Merge remote-tracking branch 'bp/main'

waitingsong · Apr 5, 2024 · 6bad284 · 6bad284
2 parents 4cb154c + 0ea5fcf
commit 6bad284
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/nodejs-win.yml.example b/.github/workflows/nodejs-win.yml.example
@@ -31,7 +31,6 @@ jobs:
         with:
           path: |
             node_modules
-            # node_modules/.cache/nx
             package-lock.json
             # packages/*/.eslintcache
             packages/*/.tsbuildinfo

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -60,7 +60,6 @@ jobs:
           locale-gen
           locale -a
           netstat -tunpl
-          # chmod a+w -R .
           dig jaeger
           export cwd=`pwd`
           git config --global --add safe.directory $cwd
@@ -147,21 +146,20 @@ jobs:
           # redis
           REDIS_HOST: redis
           REDIS_PORT: 6379
-
+          # otel
+          OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4317
+          # aliyun
           ALI_ALB_IPS: ${{ secrets.ALI_ALB_IPS }}
           ALI_ALB_GROUPID: ${{ secrets.ALI_ALB_GROUPID }}
-
           ALI_ECS_AID: ${{ secrets.ALI_ECS_AID }}
           ALI_ECS_ASECRET: ${{ secrets.ALI_ECS_ASECRET }}
           ALI_ECS_IDS: ${{ secrets.ALI_ECS_IDS }}
           ALI_ECS_IPS: ${{ secrets.ALI_ECS_IPS }}
-
           ALI_OSS_AID: ${{ secrets.ALI_OSS_AID }}
           ALI_OSS_ASECRET: ${{ secrets.ALI_OSS_ASECRET }}
           ALI_OSS_ENDPOINT: ${{ secrets.ALI_OSS_ENDPOINT }}
           ALI_OSS_BUCKET: ${{ secrets.ALI_OSS_BUCKET }}
 
-          OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4317
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4

diff --git a/.github/workflows/npm-manual-publish.yml b/.github/workflows/npm-manual-publish.yml
@@ -69,7 +69,6 @@ jobs:
           locale-gen
           locale -a
           netstat -tunpl
-          # chmod a+w -R .
           dig jaeger
 
       - name: Verify
@@ -96,7 +95,6 @@ jobs:
       - name: Install Dependencies
         timeout-minutes: 15
         run: |
-          # chmod a+w -R .
           export cwd=`pwd`
           npm i --no-audit -g autocannon c8 lerna rollup tsx zx
           npm i --no-audit
@@ -160,6 +158,17 @@ jobs:
           REDIS_PORT: 6379
           # otel
           OTEL_EXPORTER_OTLP_ENDPOINT: http://jaeger:4317
+          # aliyun
+          ALI_ALB_IPS: ${{ secrets.ALI_ALB_IPS }}
+          ALI_ALB_GROUPID: ${{ secrets.ALI_ALB_GROUPID }}
+          ALI_ECS_AID: ${{ secrets.ALI_ECS_AID }}
+          ALI_ECS_ASECRET: ${{ secrets.ALI_ECS_ASECRET }}
+          ALI_ECS_IDS: ${{ secrets.ALI_ECS_IDS }}
+          ALI_ECS_IPS: ${{ secrets.ALI_ECS_IPS }}
+          ALI_OSS_AID: ${{ secrets.ALI_OSS_AID }}
+          ALI_OSS_ASECRET: ${{ secrets.ALI_OSS_ASECRET }}
+          ALI_OSS_ENDPOINT: ${{ secrets.ALI_OSS_ENDPOINT }}
+          ALI_OSS_BUCKET: ${{ secrets.ALI_OSS_BUCKET }}
 
       - name: NPM Publish
         run: |
@@ -169,7 +178,6 @@ jobs:
           . .scripts/ci/ci-env.sh
           # fix: fatal: detected dubious ownership in repository
           git config --global --add safe.directory $cwd
-          # git restore .
           git reset --hard
           git config user.name $GITHUB_ACTOR
           git config user.email gh-actions-${GITHUB_ACTOR}@github.com
@@ -196,7 +204,11 @@ jobs:
           POSTGRES_USER: postgres
           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
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
 
       jaeger:
         image: jaegertracing/all-in-one

diff --git a/.github/workflows/npm-publish-wo-test.yml b/.github/workflows/npm-publish-wo-test.yml
@@ -117,7 +117,6 @@ jobs:
           . .scripts/ci/ci-env.sh
           # fix: fatal: detected dubious ownership in repository
           git config --global --add safe.directory $cwd
-          # git restore .
           git reset --hard
           git config user.name $GITHUB_ACTOR
           git config user.email gh-actions-${GITHUB_ACTOR}@github.com

diff --git a/package.json b/package.json
@@ -27,11 +27,11 @@
     "mocha-lcov-reporter": "1",
     "mwtsc": "^1.7.2",
     "nx": "18",
-    "swagger-ui-dist": "^5.12.0",
+    "swagger-ui-dist": "^5.13.0",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.8",
     "tsx": "4",
-    "typescript": "^5.4.3",
+    "typescript": "^5.4.4",
     "zx": "7"
   },
   "engines": {