- try to follow iDebugTool revisions

Author: hazmi-e205

.github/workflows/libinstruments.yml

@@ -8,9 +8,14 @@ on:
   workflow_dispatch:
 
 env:
-  PICOTLS_COMMIT: 5a4461d8a3948d9d26bf861e7d90cb80d8093515
-  PICOQUIC_COMMIT: 3335f4029b55f59a4868cacf3e92c3fb84982115
-  LWIP_COMMIT: 4599f551dead9eac233b91c0b9ee5879f5d0620a
+  OPENSSL_COMMIT:            ac3cef223a4c61d6bee34527b6d4c8c6432494a7
+  LIBPLIST_COMMIT:           15164ebe870590376b2286b09dc97890a07dd373
+  LIBIMOBILEDEVICE_GLUE_COMMIT: da770a7687f35fbb981db4d7b47b1b032cd5c2c7
+  LIBUSBMUXD_COMMIT:         93eb168bf6b07472d17781328c21df0c60300524
+  LIBIMOBILEDEVICE_COMMIT:   c4f111800d2b08d6c65ec075ad49c4a60e9e4309
+  PICOTLS_COMMIT:            5a4461d8a3948d9d26bf861e7d90cb80d8093515
+  PICOQUIC_COMMIT:           3335f4029b55f59a4868cacf3e92c3fb84982115
+  LWIP_COMMIT:               4599f551dead9eac233b91c0b9ee5879f5d0620a
 
 jobs:
   build:
@@ -37,31 +42,24 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    # ── Linux: system deps ────────────────────────────────────────────────
-    - name: Install Linux system dependencies
+    # ── Cache built dependencies ──────────────────────────────────────────
+    - name: Cache dependencies
+      id: cache-deps
+      uses: actions/cache@v4
+      with:
+        path: ${{ github.workspace }}/deps
+        key: ${{ runner.os }}-deps-${{ env.OPENSSL_COMMIT }}-${{ env.LIBPLIST_COMMIT }}-${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }}-${{ env.LIBUSBMUXD_COMMIT }}-${{ env.LIBIMOBILEDEVICE_COMMIT }}
+
+    # ── Linux: build tools ────────────────────────────────────────────────
+    - name: Install Linux build tools
       if: runner.os == 'Linux'
       run: |
         sudo apt-get update -qq
         sudo apt-get install -y \
           cmake ninja-build pkg-config \
-          autoconf automake libtool \
-          libplist-dev \
-          libusbmuxd-dev \
-          libimobiledevice-dev \
-          libssl-dev
-
-    - name: Build libimobiledevice-glue from source (Linux)
-      if: runner.os == 'Linux'
-      run: |
-        # libimobiledevice-glue is not packaged in Ubuntu 22.04
-        git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue.git /tmp/libimobiledevice-glue
-        cd /tmp/libimobiledevice-glue
-        ./autogen.sh --prefix=/usr/local
-        make -j$(nproc)
-        sudo make install
-        sudo ldconfig
+          autoconf automake libtool perl
 
-    # ── Windows: MSYS2 ───────────────────────────────────────────────────
+    # ── Windows: MSYS2 setup ──────────────────────────────────────────────
     - name: Set up MSYS2 (Windows)
       if: runner.os == 'Windows'
       uses: msys2/setup-msys2@v2
@@ -72,9 +70,103 @@ jobs:
           mingw-w64-x86_64-cmake
           mingw-w64-x86_64-ninja
           mingw-w64-x86_64-pkg-config
-          mingw-w64-x86_64-libimobiledevice
-          mingw-w64-x86_64-libimobiledevice-glue
-          mingw-w64-x86_64-openssl
+          mingw-w64-x86_64-toolchain
+          autoconf
+          automake
+          libtool
+          perl
+
+    # ── Build all iMobileDevice dependencies from source (Linux) ─────────
+    - name: Build dependencies (Linux)
+      if: runner.os == 'Linux' && steps.cache-deps.outputs.cache-hit != 'true'
+      run: |
+        set -e
+        DEPS=${{ github.workspace }}/deps
+        export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig
+
+        # OpenSSL 1.1.1
+        git clone https://github.com/openssl/openssl /tmp/openssl
+        git -C /tmp/openssl checkout ${{ env.OPENSSL_COMMIT }}
+        cd /tmp/openssl
+        ./config --prefix=$DEPS --openssldir=$DEPS/ssl no-tests no-shared
+        make -j$(nproc)
+        make install_sw
+
+        # libplist
+        git clone https://github.com/libimobiledevice/libplist /tmp/libplist
+        git -C /tmp/libplist checkout ${{ env.LIBPLIST_COMMIT }}
+        cd /tmp/libplist
+        ./autogen.sh --prefix=$DEPS --without-cython
+        make -j$(nproc) && make install
+
+        # libimobiledevice-glue
+        git clone https://github.com/libimobiledevice/libimobiledevice-glue /tmp/libimobiledevice-glue
+        git -C /tmp/libimobiledevice-glue checkout ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }}
+        cd /tmp/libimobiledevice-glue
+        ./autogen.sh --prefix=$DEPS
+        make -j$(nproc) && make install
+
+        # libusbmuxd
+        git clone https://github.com/libimobiledevice/libusbmuxd /tmp/libusbmuxd
+        git -C /tmp/libusbmuxd checkout ${{ env.LIBUSBMUXD_COMMIT }}
+        cd /tmp/libusbmuxd
+        ./autogen.sh --prefix=$DEPS
+        make -j$(nproc) && make install
+
+        # libimobiledevice
+        git clone https://github.com/libimobiledevice/libimobiledevice /tmp/libimobiledevice
+        git -C /tmp/libimobiledevice checkout ${{ env.LIBIMOBILEDEVICE_COMMIT }}
+        cd /tmp/libimobiledevice
+        ./autogen.sh --prefix=$DEPS --without-cython --enable-openssl \
+          OPENSSL_CFLAGS="-I$DEPS/include" OPENSSL_LIBS="-L$DEPS/lib -lssl -lcrypto"
+        make -j$(nproc) && make install
+
+    # ── Build all iMobileDevice dependencies from source (Windows) ───────
+    - name: Build dependencies (Windows)
+      if: runner.os == 'Windows' && steps.cache-deps.outputs.cache-hit != 'true'
+      shell: msys2 {0}
+      run: |
+        set -e
+        DEPS="$(cygpath -u '${{ github.workspace }}')/deps"
+        export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig
+
+        # OpenSSL 1.1.1
+        git clone https://github.com/openssl/openssl /tmp/openssl
+        git -C /tmp/openssl checkout ${{ env.OPENSSL_COMMIT }}
+        cd /tmp/openssl
+        ./Configure mingw64 --prefix=$DEPS --openssldir=$DEPS/ssl no-tests no-shared
+        make -j$(nproc)
+        make install_sw
+
+        # libplist
+        git clone https://github.com/libimobiledevice/libplist /tmp/libplist
+        git -C /tmp/libplist checkout ${{ env.LIBPLIST_COMMIT }}
+        cd /tmp/libplist
+        ./autogen.sh --prefix=$DEPS --without-cython --host=x86_64-w64-mingw32
+        make -j$(nproc) && make install
+
+        # libimobiledevice-glue
+        git clone https://github.com/libimobiledevice/libimobiledevice-glue /tmp/libimobiledevice-glue
+        git -C /tmp/libimobiledevice-glue checkout ${{ env.LIBIMOBILEDEVICE_GLUE_COMMIT }}
+        cd /tmp/libimobiledevice-glue
+        ./autogen.sh --prefix=$DEPS --host=x86_64-w64-mingw32
+        make -j$(nproc) && make install
+
+        # libusbmuxd
+        git clone https://github.com/libimobiledevice/libusbmuxd /tmp/libusbmuxd
+        git -C /tmp/libusbmuxd checkout ${{ env.LIBUSBMUXD_COMMIT }}
+        cd /tmp/libusbmuxd
+        ./autogen.sh --prefix=$DEPS --host=x86_64-w64-mingw32
+        make -j$(nproc) && make install
+
+        # libimobiledevice
+        git clone https://github.com/libimobiledevice/libimobiledevice /tmp/libimobiledevice
+        git -C /tmp/libimobiledevice checkout ${{ env.LIBIMOBILEDEVICE_COMMIT }}
+        cd /tmp/libimobiledevice
+        ./autogen.sh --prefix=$DEPS --without-cython --enable-openssl \
+          --host=x86_64-w64-mingw32 \
+          OPENSSL_CFLAGS="-I$DEPS/include" OPENSSL_LIBS="-L$DEPS/lib -lssl -lcrypto"
+        make -j$(nproc) && make install
 
     # ── QUIC deps: clone at pinned commits ───────────────────────────────
     - name: Clone QUIC dependencies
@@ -91,53 +183,65 @@ jobs:
         git clone https://github.com/lwip-tcpip/lwip /tmp/lwip
         git -C /tmp/lwip checkout ${{ env.LWIP_COMMIT }}
 
-    # ── Configure ────────────────────────────────────────────────────────
+    # ── Configure & Build (Linux) ─────────────────────────────────────────
     - name: Configure (Linux)
       if: runner.os == 'Linux' && !matrix.quic
       run: |
+        DEPS=${{ github.workspace }}/deps
+        export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig
         cmake -B build -S . \
           -G Ninja \
           -DCMAKE_BUILD_TYPE=Release \
           -DINSTRUMENTS_BUILD_TOOL=ON \
-          -DCMAKE_PREFIX_PATH=/usr/local
+          -DCMAKE_PREFIX_PATH=$DEPS
 
     - name: Configure (Linux, QUIC)
       if: runner.os == 'Linux' && matrix.quic
       run: |
+        DEPS=${{ github.workspace }}/deps
+        export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig
         cmake -B build -S . \
           -G Ninja \
           -DCMAKE_BUILD_TYPE=Release \
           -DINSTRUMENTS_BUILD_TOOL=ON \
           -DINSTRUMENTS_HAS_QUIC=ON \
+          -DCMAKE_PREFIX_PATH=$DEPS \
+          -DOPENSSL_ROOT_DIR=$DEPS \
           -DPICOTLS_SOURCE_DIR=/tmp/picotls \
           -DPICOQUIC_SOURCE_DIR=/tmp/picoquic \
-          -DLWIP_SOURCE_DIR=/tmp/lwip \
-          -DCMAKE_PREFIX_PATH=/usr/local
+          -DLWIP_SOURCE_DIR=/tmp/lwip
 
     - name: Build (Linux)
       if: runner.os == 'Linux'
       run: cmake --build build --parallel
 
-    # ── Windows builds (configure + build in one MSYS2 shell) ────────────
+    # ── Configure & Build (Windows) ───────────────────────────────────────
     - name: Configure & Build (Windows)
       if: runner.os == 'Windows' && !matrix.quic
       shell: msys2 {0}
       run: |
+        DEPS="$(cygpath -u '${{ github.workspace }}')/deps"
+        export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig
         cmake -B build -S . \
           -G Ninja \
           -DCMAKE_BUILD_TYPE=Release \
-          -DINSTRUMENTS_BUILD_TOOL=ON
+          -DINSTRUMENTS_BUILD_TOOL=ON \
+          -DCMAKE_PREFIX_PATH=$DEPS
         cmake --build build --parallel
 
     - name: Configure & Build (Windows, QUIC)
       if: runner.os == 'Windows' && matrix.quic
       shell: msys2 {0}
       run: |
+        DEPS="$(cygpath -u '${{ github.workspace }}')/deps"
+        export PKG_CONFIG_PATH=$DEPS/lib/pkgconfig
         cmake -B build -S . \
           -G Ninja \
           -DCMAKE_BUILD_TYPE=Release \
           -DINSTRUMENTS_BUILD_TOOL=ON \
           -DINSTRUMENTS_HAS_QUIC=ON \
+          -DCMAKE_PREFIX_PATH=$DEPS \
+          -DOPENSSL_ROOT_DIR=$DEPS \
           -DPICOTLS_SOURCE_DIR=/tmp/picotls \
           -DPICOQUIC_SOURCE_DIR=/tmp/picoquic \
           -DLWIP_SOURCE_DIR=/tmp/lwip