up

Coloryr · May 6, 2024 · fd7d674 · fd7d674
1 parent f6eb8e6
commit fd7d674
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 36 deletions.
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
@@ -61,47 +61,53 @@ jobs:
         sudo -u builder ./build/build-linux.sh && \
         sudo -u builder ./build/build-arch.sh"
 
-    - name: 上传 linux-x86.pkg.tar.zst
+    - name: 上传 linux-x86_64.pkg.tar.zst
       uses: actions/upload-artifact@v4
       with:
         name: "colormc-arch-x86_64"
         path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-1-x86_64.pkg.tar.zst
-
-    - name: 上传 linux-x86-aot.pkg.tar.zst
-      uses: actions/upload-artifact@v4
-      with:
-        name: "colormc-arch-x86_64-aot"
-        path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-1-x86_64-aot.pkg.tar.zst
-
-    - name: 上传 linux-x64.deb
-      uses: actions/upload-artifact@v4
-      with:
-        name: "colormc-ubuntu-x64"
-        path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-x64.deb
-
-    - name: 上传 linux-arm64.deb
-      uses: actions/upload-artifact@v4
-      with:
-        name: "colormc-ubuntu-arm64"
-        path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-arm64.deb
-
-    - name: 上传 linux-x64-aot.deb
-      uses: actions/upload-artifact@v4
-      with:
-        name: "colormc-ubuntu-x64-aot"
-        path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-x64-aot.deb
-
-    - name: 上传 linux-arm64-aot.deb
-      uses: actions/upload-artifact@v4
-      with:
-        name: "colormc-ubuntu-arm64-aot"
-        path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-arm64-aot.deb
 
-    - name: 上传 linux-x64-appimage.deb
+    - name: 上传 linux-x86_64
       uses: actions/upload-artifact@v4
       with:
-        name: "colormc-linux-x64-appimage"
-        path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-x86_64.AppImage
+        name: "colormc-arch-x86_64"
+        path: src/build_out
+
+    # - name: 上传 linux-x86-aot.pkg.tar.zst
+    #   uses: actions/upload-artifact@v4
+    #   with:
+    #     name: "colormc-arch-x86_64-aot"
+    #     path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-1-x86_64-aot.pkg.tar.zst
+
+    # - name: 上传 linux-x64.deb
+    #   uses: actions/upload-artifact@v4
+    #   with:
+    #     name: "colormc-ubuntu-x64"
+    #     path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-x64.deb
+
+    # - name: 上传 linux-arm64.deb
+    #   uses: actions/upload-artifact@v4
+    #   with:
+    #     name: "colormc-ubuntu-arm64"
+    #     path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-arm64.deb
+
+    # - name: 上传 linux-x64-aot.deb
+    #   uses: actions/upload-artifact@v4
+    #   with:
+    #     name: "colormc-ubuntu-x64-aot"
+    #     path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-x64-aot.deb
+
+    # - name: 上传 linux-arm64-aot.deb
+    #   uses: actions/upload-artifact@v4
+    #   with:
+    #     name: "colormc-ubuntu-arm64-aot"
+    #     path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-arm64-aot.deb
+
+    # - name: 上传 linux-x64-appimage.deb
+    #   uses: actions/upload-artifact@v4
+    #   with:
+    #     name: "colormc-linux-x64-appimage"
+    #     path: build_out/colormc-${{ env.MAINVERSION }}${{ env.VERSION }}-linux-x86_64.AppImage
 
   # build-macos:
   #   runs-on: ubuntu-latest

diff --git a/build/build-arch.sh b/build/build-arch.sh
@@ -57,7 +57,7 @@ build_arch_aot()
 {
     echo "build colormc-$main_version$version-$1-aot.pkg.tar.zst"
 
-    base=./src/build_out/$1-dotnet
+    base=./src/build_out/$1-dotnet-aot
     base_dir="$base/colormc_arch"
 
     mkdir $base_dir
@@ -93,5 +93,5 @@ build_arch_aot()
 
 build_arch linux-x64 x86_64
 # build_arch linux-arm64 aarch64
-build_arch_aot linux-x64 x86_64
+# build_arch_aot linux-x64 x86_64
 # build_arch_aot linux-arm64 aarch64