merge

Author: Sjj1024

.github/workflows/arm.yml

@@ -1,124 +1,88 @@
-# name: 'publish'
+# name: 'Publish Linux Arm'
 
 # on:
+#     workflow_dispatch:
 #     push:
 #         branches:
 #             - webdev
 
+# # linux arm 需要配置tauri.conf.json target 只要 linux
+# # The bundle targets, currently supports [“deb”, “rpm”] or "all"
 # jobs:
-#     alpha-for-linux-arm: # 针对 Linux ARM 架构的构建任务
+#     build:
+#         runs-on: ubuntu-22.04
+
 #         strategy:
-#             fail-fast: false
 #             matrix:
+#                 arch: [aarch64, armv7l]
 #                 include:
-#                     - os: ubuntu-22.04
-#                       target: aarch64-unknown-linux-gnu # 目标架构：aarch64
-#                       arch: arm64
-#                     - os: ubuntu-22.04
-#                       target: armv7-unknown-linux-gnueabihf # 目标架构：armv7
-#                       arch: armhf
-#         runs-on: ${{ matrix.os }}
-#         steps:
-#             - name: Checkout Repository # 检出代码库
-#               uses: actions/checkout@v4
+#                     - arch: aarch64
+#                       cpu: cortex-a72
+#                       base_image: https://dietpi.com/downloads/images/DietPi_RPi-ARMv8-Bookworm.img.xz
+#                       deb: arm64
+#                       rpm: aarch64
+#                       appimage: aarch64
+#                     - arch: armv7l
+#                       cpu: cortex-a53
+#                       deb: armhfp
+#                       rpm: arm
+#                       appimage: armhf
+#                       base_image: https://dietpi.com/downloads/images/DietPi_RPi-ARMv7-Bookworm.img.xz
 
-#             - name: Install Rust Stable # 安装稳定版的 Rust
-#               uses: dtolnay/rust-toolchain@stable
-
-#             - name: Add Rust Target # 添加 Rust 目标架构
-#               run: rustup target add ${{ matrix.target }}
+#         steps:
+#             - uses: actions/checkout@v4
 
-#             - name: Rust Cache # 设置 Rust 缓存
+#             - name: Cache rust build artifacts
 #               uses: Swatinem/rust-cache@v2
 #               with:
 #                   workspaces: src-tauri
-#                   cache-all-crates: true
+#                   cache-on-failure: true
 
-#             - uses: pnpm/action-setup@v3
+#             - name: Build app
+#               uses: pguyot/arm-runner-action@v2.6.5
 #               with:
-#                   version: latest
-
-#             - name: Sync node version and setup cache
-#               uses: actions/setup-node@v4
+#                   base_image: ${{ matrix.base_image }}
+#                   cpu: ${{ matrix.cpu }}
+#                   bind_mount_repository: true
+#                   image_additional_mb: 10240
+#                   optimize_image: no
+#                   #exit_on_fail: no
+#                   commands: |
+#                       # Prevent Rust from complaining about $HOME not matching eid home
+#                       export HOME=/root
+#                       # Workaround to CI worker being stuck on Updating crates.io index
+#                       export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+#                       # Install setup prerequisites
+#                       apt-get update -y --allow-releaseinfo-change
+#                       apt-get autoremove -y
+#                       apt-get install -y --no-install-recommends --no-install-suggests curl libwebkit2gtk-4.1-dev build-essential libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf libfuse2 file
+#                       curl https://sh.rustup.rs -sSf | sh -s -- -y
+#                       . "$HOME/.cargo/env"
+#                       curl -fsSL https://deb.nodesource.com/setup_lts.x | bash
+#                       apt-get install -y nodejs
+#                       # Install frontend dependencies
+#                       npm install -g pnpm
+#                       pnpm install
+#                       # Build the application
+#                       pnpm tauri build -- --verbose
+#             - name: Get app version
+#               run: echo "APP_VERSION=$(jq -r .version src-tauri/tauri.conf.json)" >> $GITHUB_ENV
+
+#             # TODO: Combine this with the basic workflow and upload the files to the Release.
+#             - name: Upload deb bundle
+#               uses: actions/upload-artifact@v4
 #               with:
-#                   node-version: 20
-#                   cache: pnpm
-
-#             - name: Install frontend dependencies
-#               run: pnpm install
-
-#             - name: 'Setup for linux' # 设置 Linux 环境
-#               run: |-
-#                   sudo ls -lR /etc/apt/
-
-#                   cat > /tmp/sources.list << EOF
-#                   deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy main multiverse universe restricted
-#                   deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-security main multiverse universe restricted
-#                   deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse universe restricted
-#                   deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse universe restricted
+#                   name: Debian Bundle
+#                   path: ${{ github.workspace }}/src-tauri/target/release/bundle/deb/Baidu_${{ env.APP_VERSION }}_${{ matrix.deb }}.deb
 
-#                   deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy main multiverse universe restricted
-#                   deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main multiverse universe restricted
-#                   deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main multiverse universe restricted
-#                   deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main multiverse universe restricted
-#                   EOF
-
-#                   sudo mv /etc/apt/sources.list /etc/apt/sources.list.default
-#                   sudo mv /tmp/sources.list /etc/apt/sources.list
-
-#                   sudo dpkg --add-architecture ${{ matrix.arch }}
-#                   sudo apt update
-
-#                   sudo apt install -y \
-#                     libwebkit2gtk-4.1-dev:${{ matrix.arch }} \
-#                     libayatana-appindicator3-dev:${{ matrix.arch }} \
-#                     libssl-dev:${{ matrix.arch }} \
-#                     patchelf:${{ matrix.arch }} \
-#                     librsvg2-dev:${{ matrix.arch }}
-
-#             - name: 'Install aarch64 tools' # 安装 aarch64 工具链
-#               if: matrix.target == 'aarch64-unknown-linux-gnu'
-#               run: |
-#                   sudo apt install -y \
-#                     gcc-aarch64-linux-gnu \
-#                     g++-aarch64-linux-gnu
-
-#             - name: 'Install armv7 tools' # 安装 armv7 工具链
-#               if: matrix.target == 'armv7-unknown-linux-gnueabihf'
-#               run: |
-#                   sudo apt install -y \
-#                     gcc-arm-linux-gnueabihf \
-#                     g++-arm-linux-gnueabihf
-
-#             - name: Build for Linux # 构建 Linux 应用程序
-#               run: |
-#                   export PKG_CONFIG_ALLOW_CROSS=1
-#                   if [ "${{ matrix.target }}" == "aarch64-unknown-linux-gnu" ]; then
-#                     export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/:$PKG_CONFIG_PATH
-#                     export PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu/
-#                   elif [ "${{ matrix.target }}" == "armv7-unknown-linux-gnueabihf" ]; then
-#                     export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/:$PKG_CONFIG_PATH
-#                     export PKG_CONFIG_SYSROOT_DIR=/usr/arm-linux-gnueabihf/
-#                   fi
-#                   pnpm tauri build --target ${{ matrix.target }}
-#               env:
-#                   NODE_OPTIONS: '--max_old_space_size=4096'
-
-#             - name: Get Version # 获取版本号
-#               run: |
-#                   sudo apt-get update
-#                   sudo apt-get install jq
-#                   echo "VERSION=$(cat package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
-#                   echo "BUILDTIME=$(TZ=Asia/Shanghai date)" >> $GITHUB_ENV
+#             - name: Upload rpm bundle
+#               uses: actions/upload-artifact@v4
+#               with:
+#                   name: RPM Bundle
+#                   path: ${{ github.workspace }}/src-tauri/target/release/bundle/rpm/Baidu_${{ env.APP_VERSION }}-1.${{ matrix.rpm }}.rpm
 
-#             - name: Upload Release # 上传发布文件
-#               uses: softprops/action-gh-release@v2
+#             - name: Upload appimage bundle
+#               uses: actions/upload-artifact@v4
 #               with:
-#                   tag_name: alpha
-#                   name: 'Clash Verge Rev Alpha'
-#                   body: 'More new features are now supported.'
-#                   prerelease: true
-#                   token: ${{ secrets.GITHUB_TOKEN }}
-#                   files: |
-#                       src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
-#                       src-tauri/target/${{ matrix.target }}/release/bundle/rpm/*.rpm
+#                   name: AppImage Bundle
+#                   path: ${{ github.workspace }}/src-tauri/target/release/bundle/appimage/Baidu_${{ env.APP_VERSION }}_${{ matrix.appimage }}.AppImage

.github/workflows/build.yml

@@ -10,7 +10,7 @@ pub async fn resolve_setup(app: &mut App) -> Result<(), Error> {
         {
             "title": "PakePlus",
             "visible": false,
-            "url": "https://www.baidu.com/",
+            "url": "https://www.baidu.com/index.htm",
             "label": "main"
         }
     "#;

src-tauri/src/utils/init.rs

@@ -1,8 +1,8 @@
 {
     "$schema": "https://schema.tauri.app/config/2",
-    "productName": "PakePlus",
+    "productName": "Baidu",
     "version": "0.1.0",
-    "identifier": "com.pakeplus.app",
+    "identifier": "com.baidu.app",
     "build": {
         "frontendDist": "../src"
     },
@@ -22,7 +22,7 @@
     },
     "bundle": {
         "active": true,
-        "targets": ["deb"],
+        "targets": ["rpm", "deb"],
         "resources": ["./data/*"],
         "icon": [
             "icons/32x32.png",

src-tauri/tauri.conf.json

@@ -0,0 +1 @@
+import{r,A as e,_ as o}from"./index-efa3a32c.js";import{C as t}from"./CheckOutlined-f0d55485.js";var a=function(a,n){return r.createElement(e,o({},a,{ref:n,icon:t}))};const n=r.forwardRef(a);export{n as C};