action

Author: Coloryr

.github/workflows/dotnet-build.yml

@@ -21,21 +21,14 @@ jobs:
     - name: 设置.NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 10.0.101
+        dotnet-version: 10.0.103
 
     - name: Read version number
       id: version
       run: |
         VERSION=$(cat ./build/version)
         echo "VERSION=$VERSION" >> $GITHUB_ENV  
 
-    # - name: 更新源码
-    #   shell: bash
-    #   working-directory: ./
-    #   run: |
-    #     chmod a+x ./build/update.sh
-    #     ./build/update.sh
-
     - name: 构建源码
       shell: bash
       working-directory: ./
@@ -187,21 +180,14 @@ jobs:
     - name: 设置.NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 10.0.101
+        dotnet-version: 10.0.103
 
     - name: Read version number
       id: version
       run: |
         VERSION=$(cat ./build/version)
         echo "VERSION=$VERSION" >> $GITHUB_ENV  
 
-    # - name: 更新源码
-    #   shell: bash
-    #   working-directory: ./
-    #   run: |
-    #     chmod a+x ./build/update.sh
-    #     ./build/update.sh
-
     - name: 构建
       shell: bash
       working-directory: ./
@@ -233,6 +219,29 @@ jobs:
       with:
         name: "colormc-macos-min-aarch64"
         path: build_out/colormc-macos-${{ env.VERSION }}-min-aarch64.zip
+    - name: 上传 colormc-macos-x86_64-dmg
+      uses: actions/upload-artifact@v4
+      with:
+        name: "colormc-macos-x86_64-dmg"
+        path: build_out/colormc-macos-${{ env.VERSION }}-x86_64.dmg
+
+    - name: 上传 colormc-macos-min-x86_64-dmg
+      uses: actions/upload-artifact@v4
+      with:
+        name: "colormc-macos-min-x86_64-dmg"
+        path: build_out/colormc-macos-${{ env.VERSION }}-min-x86_64.dmg
+
+    - name: 上传 colormc-macos-aarch64-dmg
+      uses: actions/upload-artifact@v4
+      with:
+        name: "colormc-macos-aarch64-dmg"
+        path: build_out/colormc-macos-${{ env.VERSION }}-aarch64.dmg
+
+    - name: 上传 colormc-macos-min-aarch64-dmg
+      uses: actions/upload-artifact@v4
+      with:
+        name: "colormc-macos-min-aarch64-dmg"
+        path: build_out/colormc-macos-${{ env.VERSION }}-min-aarch64.dmg
 
   build-windows:
     runs-on: windows-latest
@@ -251,12 +260,7 @@ jobs:
     - name: 设置.NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 10.0.101
-
-    # - name: 更新源码
-    #   shell: cmd
-    #   working-directory: ./
-    #   run: ./build/update.cmd
+        dotnet-version: 10.0.103
 
     - name: 构建 源码
       shell: cmd

build/build-dmg.sh

@@ -33,7 +33,7 @@ build() {
     local app_name="ColorMC"
     local app_path="./src/build_out/$1-dotnet/ColorMC.app"
     local background=${2:-""}  # 可选背景图
-    local output_name="colormc-macos-$version-$1"
+    local output_name="colormc-macos-$version-$2"
 
     echo "build DMG: $output_name"
 
@@ -68,7 +68,7 @@ build_min() {
     local app_name="ColorMC"
     local app_path="./src/build_out/$1-min/ColorMC.app"
     local background=${2:-""}  # 可选背景图
-    local output_name="colormc-macos-$version-min-$1"
+    local output_name="colormc-macos-$version-min-$2"
 
     echo "build DMG: $output_name"
 
@@ -106,7 +106,7 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-build osx-arm64
-build osx-x64
-build_min osx-arm64
-build_min osx-x64
+build osx-arm64 aarch64
+build osx-x64 x86_64
+build_min osx-arm64 aarch64
+build_min osx-x64 x86_64