Update test-linux.yml

Author: kazuki0824

.github/workflows/test-linux.yml

@@ -44,14 +44,19 @@ jobs:
           if [ "$TARGET" = "x86_64-unknown-linux-gnu" ]; then
             sudo apt-get install -y libpcsclite-dev libdvbv5-dev libudev-dev
           else
+            # マルチアーチ用 i386 を有効化
             sudo dpkg --add-architecture i386
             sudo apt-get update -qq
+
+            # i386 用 pkg-config とライブラリをインストール
             sudo apt-get install -y \
-              libpcsclite-dev:i386 libdvbv5-dev:i386 libudev-dev:i386
-            # Configure pkg-config for cross-compilation
-            echo "PKG_CONFIG_SYSROOT_DIR_$TARGET=/" >> $GITHUB_ENV
-            echo "PKG_CONFIG_LIBDIR_$TARGET=/usr/lib/i386-linux-gnu/pkgconfig" >> $GITHUB_ENV
-            echo "PKG_CONFIG_PATH_$TARGET=" >> $GITHUB_ENV
+              pkg-config:i386 \
+              libpcsclite-dev:i386 \
+              libdvbv5-dev:i386 \
+              libudev-dev:i386
+
+            # 以降の pkg-config 呼び出しを i386 用に向ける
+            echo "PKG_CONFIG=/usr/bin/pkg-config" >> $GITHUB_ENV
           fi
         shell: bash
 
@@ -66,8 +71,13 @@ jobs:
 
       - name: Cargo Check & Test
         run: |
-          cargo check -F dvb --target ${{ matrix.target_arch }}
-          cargo test  -F dvb --target ${{ matrix.target_arch }}
+          if [ "${{ matrix.target_arch }}" = "i686-unknown-linux-gnu" ]; then
+              cargo check -F dvb --target ${{ matrix.target_arch }}
+              cargo test  -F dvb --target ${{ matrix.target_arch }}
+          else
+            cargo check -F dvb --target ${{ matrix.target_arch }}
+            cargo test  -F dvb --target ${{ matrix.target_arch }}
+          fi
         shell: bash
 
   # ──────────────────────────────
@@ -106,7 +116,9 @@ jobs:
             curl https://sh.rustup.rs -sSf | sh -s -- -y && \
             source \$HOME/.cargo/env && \
             rustup target add aarch64-unknown-linux-gnu && \
-            echo 'PKG_CONFIG_SYSROOT_DIR=/;PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig;PKG_CONFIG_PATH=' | tee /etc/environment && \
+            # aarch64 用 pkg-config をインストールして切り替え
+            apt-get install -y pkg-config:aarch64 && \
+            echo 'PKG_CONFIG=/usr/bin/pkg-config' | tee -a /etc/environment && \
             cargo check -F dvb --target aarch64-unknown-linux-gnu && \
             cargo test  -F dvb --target aarch64-unknown-linux-gnu \
           "