Merge remote-tracking branch 'origin/developing' into developing

rom4j · Jun 24, 2023 · 79ad9b4 · 79ad9b4
2 parents efd9aa4 + ca868a3
commit 79ad9b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/release_test.yml b/.github/workflows/release_test.yml
@@ -132,6 +132,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
+          build_script_name: "build:main:prod"
           args: "-c.appId=com.chat2db.test -c.productName=Chat2DB-Test -c.extraMetadata.version=1.0.${{ github.run_id }}-Test --win --x64"
 
       # macos amd64
@@ -143,6 +144,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
+          build_script_name: "build:main:prod"
           args: "-c.appId=com.chat2db.test -c.productName=Chat2DB-Test -c.win.publisherName=Chat2DB-Test -c.nsis.shortcutName=Chat2DB-Test -c.extraMetadata.version=1.0.${{ github.run_id }}-Test --mac --x64"
 
       # amd64 notarization
@@ -160,6 +162,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
+          build_script_name: "build:main:prod"
           args: "-c.appId=com.chat2db.test -c.productName=Chat2DB-Test -c.extraMetadata.version=1.0.${{ github.run_id }}-Test --mac --arm64"
 
       # arm notarization

diff --git a/chat2db-client/package.json b/chat2db-client/package.json
@@ -15,7 +15,7 @@
     "build:main": "cross-env NODE_ENV=development electron-builder",
     "build:main:prod": "cross-env NODE_ENV=production electron-builder",
     "build:web": "umi build",
-    "build:web:desktop": "cross-env UMI_ENV=desktop umi build",
+    "build:web:desktop": "cross-env UMI_ENV=desktop APP_VERSION=${npm_config_appVersion} cross-env APP_PORT=${npm_config_appPort} umi build",
     "build:web:prod": "cross-env UMI_ENV=prod cross-env APP_VERSION=${npm_config_appVersion} cross-env APP_PORT=${npm_config_appPort} umi build",
     "postinstall": "umi setup",
     "lint": "umi lint",