chore: update PKG_CONFIG_SYSROOT_DIR

idootop · Mar 21, 2024 · d2992a3 · d2992a3
1 parent c42da32
commit d2992a3
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/.github/workflows/desktop.yaml b/.github/workflows/desktop.yaml
@@ -150,7 +150,6 @@ jobs:
   #       with:
   #         workspaces: "packages/feiyu-desktop/src-tauri/${{ matrix.target }} -> target"
   #     - name: 构建飞鱼 APP
-  #       id: app
   #       run: |
   #         cd packages/feiyu-desktop
   #         cargo install tauri-cli --version "^2.0.0-beta"
@@ -242,6 +241,7 @@ jobs:
           deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse
           EOF
       - name: 初始化 Linux 构建环境
+        id: pkg
         run: |
           if [ "${{ matrix.target }}" = "x86_64-unknown-linux-gnu" ]; then
               sudo apt-get update
@@ -251,22 +251,19 @@ jobs:
               sudo apt update
               sudo apt install -y gcc-multilib g++-multilib lib32stdc++6 libc6-dev-i386
               sudo apt install -y libwebkit2gtk-4.0-dev:i386 libgtk-3-dev:i386 librsvg2-dev:i386
-              export CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=i686-linux-gnu-gcc
-              export PKG_CONFIG_SYSROOT_DIR=/usr/i686-linux-gnu/
+              echo "PKG_CONFIG_SYSROOT_DIR=/usr/i686-linux-gnu/" >> $GITHUB_OUTPUT
           elif [ "${{ matrix.target }}" = "aarch64-unknown-linux-gnu" ]; then
               sudo dpkg --add-architecture arm64
               sudo apt update
               sudo apt install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross
               sudo apt install -y libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 patchelf:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64
-              export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
-              export PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu/
+              echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu/" >> $GITHUB_OUTPUT
           elif [ "${{ matrix.target }}" = "armv7-unknown-linux-gnueabihf" ]; then
               sudo dpkg --add-architecture armhf
               sudo apt update
               sudo apt install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc6-dev-armhf-cross
               sudo apt install -y libwebkit2gtk-4.0-dev:armhf libgtk-3-dev:armhf patchelf:armhf librsvg2-dev:armhf libayatana-appindicator3-dev:armhf
-              export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
-              export PKG_CONFIG_SYSROOT_DIR=/usr/arm-linux-gnueabihf/
+              echo "PKG_CONFIG_SYSROOT_DIR=/usr/arm-linux-gnueabihf/" >> $GITHUB_OUTPUT
           fi
       - name: 构建飞鱼 APP
         id: app
@@ -283,6 +280,11 @@ jobs:
         env:
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          PKG_CONFIG_ALLOW_CROSS: 1
+          PKG_CONFIG_SYSROOT_DIR: ${{ pkg.outputs.PKG_CONFIG_SYSROOT_DIR }}
+          CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-gcc
+          CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
+          CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
       - name: 重命名安装包
         run: |
           # .deb