update build.yaml

Author: nikhilsinhaparseable

.github/workflows/build.yaml

@@ -1,13 +1,12 @@
+---
 name: Ensure parseable builds on all release targets
-
 on:
   pull_request:
     paths-ignore:
-      - "docs/**"
-      - "helm/**"
-      - "assets/**"
+      - docs/**
+      - helm/**
+      - assets/**
       - "**.md"
-
 jobs:
   # Default build without Kafka
   build-default:
@@ -30,15 +29,12 @@ jobs:
           # Windows build
           - os: windows-latest
             target: x86_64-pc-windows-msvc
-
     steps:
       - uses: actions/checkout@v4
-
       - name: Setup Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.target }}
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:
@@ -47,14 +43,12 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-cargo-${{ matrix.target }}-default-${{ hashFiles('**/Cargo.lock') }}
-
       - name: Build
         uses: actions-rs/cargo@v1
         with:
           use-cross: ${{ runner.os == 'Linux' }}
           command: build
           args: --target ${{ matrix.target }} --release
-
   # Kafka build for supported platforms
   build-kafka:
     name: Build Kafka ${{matrix.target}}
@@ -68,10 +62,8 @@ jobs:
             target: x86_64-unknown-linux-gnu
           - os: macos-latest
             target: aarch64-apple-darwin
-
     steps:
       - uses: actions/checkout@v4
-
       # Linux-specific dependencies
       - name: Install Linux dependencies
         if: runner.os == 'Linux'
@@ -90,7 +82,6 @@ jobs:
             python3 \
             gcc-aarch64-linux-gnu \
             g++-aarch64-linux-gnu
-          
           # Install cross-compilation specific packages
           if [ "${{ matrix.target }}" = "aarch64-unknown-linux-gnu" ]; then
             sudo apt-get install -y \
@@ -101,7 +92,6 @@ jobs:
               libssl-dev:arm64 \
               pkg-config-aarch64-linux-gnu
           fi
-
       # macOS-specific dependencies
       - name: Install macOS dependencies
         if: runner.os == 'macOS'
@@ -115,67 +105,52 @@ jobs:
             [email protected] \
             cyrus-sasl \
             python3
-
       - name: Setup Rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.target }}
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             target
-          key: ${{ runner.os }}-cargo-${{ matrix.target }}-kafka-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Build with Kafka
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ runner.os == 'Linux' }}
-          command: build
-          args: --target ${{ matrix.target }} --features kafka --release
-        env:
-          LIBRDKAFKA_SSL_VENDORED: 1
-          PKG_CONFIG_ALLOW_CROSS: "1"
-          PKG_CONFIG_PATH: "/usr/lib/aarch64-linux-gnu/pkgconfig"
-          SASL2_DIR: "/usr/lib/aarch64-linux-gnu"
-          OPENSSL_DIR: "/usr/lib/aarch64-linux-gnu"
-          OPENSSL_ROOT_DIR: "/usr/lib/aarch64-linux-gnu"
-          OPENSSL_STATIC: "1"
-          SASL2_STATIC: "0"
-        # Add the fix as a pre-run script right before cargo build runs
-        # This is a workaround since actions-rs/cargo doesn't support pre-commands
+          key: ${{ runner.os }}-cargo-${{ matrix.target }}-kafka-${{
+            hashFiles('**/Cargo.lock') }}
+      - name: Find and fix librdkafka CMakeLists.txt
+        if: runner.os == 'Linux' || runner.os == 'macOS'
         run: |
           cargo fetch
-          
           # Find the rdkafka-sys package directory
           RDKAFKA_SYS_DIR=$(find ~/.cargo/registry/src -name "rdkafka-sys-*" -type d | head -n 1)
           echo "Found rdkafka-sys at: $RDKAFKA_SYS_DIR"
-          
           # Find the librdkafka CMakeLists.txt file
           CMAKE_FILE="$RDKAFKA_SYS_DIR/librdkafka/CMakeLists.txt"
-          
           if [ -f "$CMAKE_FILE" ]; then
             echo "Found CMakeLists.txt at: $CMAKE_FILE"
-            
             # Make a backup of the original file
             cp "$CMAKE_FILE" "$CMAKE_FILE.bak"
-            
-            # Replace the minimum required version - with OS-specific syntax
-            if [ "${{ runner.os }}" == "macOS" ]; then
-              sed -i '' 's/cmake_minimum_required(VERSION 3.2)/cmake_minimum_required(VERSION 3.5)/' "$CMAKE_FILE"
-            else
-              sed -i 's/cmake_minimum_required(VERSION 3.2)/cmake_minimum_required(VERSION 3.5)/' "$CMAKE_FILE"
-            fi
-            
+            # Replace the minimum required version
+            sed -i 's/cmake_minimum_required(VERSION 3.2)/cmake_minimum_required(VERSION 3.5)/' "$CMAKE_FILE"
             echo "Modified CMakeLists.txt - before and after comparison:"
             diff "$CMAKE_FILE.bak" "$CMAKE_FILE" || true
           else
             echo "Could not find librdkafka CMakeLists.txt file!"
             exit 1
           fi
-          
-          # Now run the actual build
-          cargo build --target ${{ matrix.target }} --features kafka --release
+      - name: Build with Kafka
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: ${{ runner.os == 'Linux' }}
+          command: build
+          args: --target ${{ matrix.target }} --features kafka --release
+        env:
+          LIBRDKAFKA_SSL_VENDORED: 1
+          PKG_CONFIG_ALLOW_CROSS: "1"
+          PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
+          SASL2_DIR: /usr/lib/aarch64-linux-gnu
+          OPENSSL_DIR: /usr/lib/aarch64-linux-gnu
+          OPENSSL_ROOT_DIR: /usr/lib/aarch64-linux-gnu
+          OPENSSL_STATIC: "1"
+          SASL2_STATIC: "0"