Refactor native build process: move Dockerfiles and build logic into dedicated scripts directory.

0x25CBFC4F · 0x25CBFC4F · commit 0164c7fa9581 · 2025-10-31T01:48:28.000+04:00
diff --git a/.github/docker/linux.Dockerfile b/.github/docker/linux.Dockerfile
@@ -0,0 +1,25 @@
+FROM debian:bookworm-slim
+
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    cmake \
+    libssl-dev \
+    zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY Native/libssh2 /src/libssh2
+WORKDIR /src/libssh2/build
+
+RUN cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=ON \
+    -DENABLE_ZLIB_COMPRESSION=ON \
+    -DCRYPTO_BACKEND=OpenSSL \
+    -DBUILD_EXAMPLES=OFF \
+    -DBUILD_TESTING=OFF && \
+    cmake --build . --config Release -j$(nproc) && \
+    mkdir -p /output && \
+    cp src/libssh2.so* /output/
+
+FROM scratch
+COPY --from=0 /output/* /
diff --git a/.github/docker/macos.Dockerfile b/.github/docker/macos.Dockerfile
@@ -0,0 +1,41 @@
+FROM crazymax/osxcross:latest-ubuntu AS builder
+ARG TARGET_TRIPLE
+
+# Install additional dependencies
+RUN apt-get update && apt-get install -y \
+    cmake \
+    wget \
+    && rm -rf /var/lib/apt/lists/*
+
+# Download and build OpenSSL for macOS
+WORKDIR /build
+RUN wget https://www.openssl.org/source/openssl-3.0.15.tar.gz && \
+    tar xzf openssl-3.0.15.tar.gz && \
+    cd openssl-3.0.15 && \
+    CC=${TARGET_TRIPLE}-clang \
+    ./Configure darwin64-${TARGET_TRIPLE##*-}-cc --prefix=/opt/osxcross/SDK/MacOSX14.5.sdk/usr && \
+    make -j$(nproc) && \
+    make install_sw
+
+# Build libssh2
+COPY Native/libssh2 /src/libssh2
+WORKDIR /src/libssh2/build
+
+RUN cmake .. \
+    -DCMAKE_SYSTEM_NAME=Darwin \
+    -DCMAKE_C_COMPILER=${TARGET_TRIPLE}-clang \
+    -DCMAKE_CXX_COMPILER=${TARGET_TRIPLE}-clang++ \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=ON \
+    -DENABLE_ZLIB_COMPRESSION=ON \
+    -DCRYPTO_BACKEND=OpenSSL \
+    -DCMAKE_FIND_ROOT_PATH=/opt/osxcross/SDK/MacOSX14.5.sdk \
+    -DOPENSSL_ROOT_DIR=/opt/osxcross/SDK/MacOSX14.5.sdk/usr \
+    -DBUILD_EXAMPLES=OFF \
+    -DBUILD_TESTING=OFF && \
+    cmake --build . --config Release -j$(nproc) && \
+    mkdir -p /output && \
+    cp src/libssh2*.dylib /output/libssh2.dylib
+
+FROM scratch
+COPY --from=builder /output/* /
diff --git a/.github/docker/windows.Dockerfile b/.github/docker/windows.Dockerfile
@@ -0,0 +1,40 @@
+FROM debian:bookworm-slim
+ARG TARGET_TRIPLE
+
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    cmake \
+    mingw-w64 \
+    wget \
+    && rm -rf /var/lib/apt/lists/*
+
+# Download and build OpenSSL for Windows
+WORKDIR /build
+RUN wget https://www.openssl.org/source/openssl-3.0.15.tar.gz && \
+    tar xzf openssl-3.0.15.tar.gz && \
+    cd openssl-3.0.15 && \
+    ./Configure mingw64 --cross-compile-prefix=${TARGET_TRIPLE}- --prefix=/opt/openssl-${TARGET_TRIPLE} && \
+    make -j$(nproc) && \
+    make install_sw
+
+# Build libssh2
+COPY Native/libssh2 /src/libssh2
+WORKDIR /src/libssh2/build
+
+RUN cmake .. \
+    -DCMAKE_SYSTEM_NAME=Windows \
+    -DCMAKE_C_COMPILER=${TARGET_TRIPLE}-gcc \
+    -DCMAKE_RC_COMPILER=${TARGET_TRIPLE}-windres \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=ON \
+    -DENABLE_ZLIB_COMPRESSION=OFF \
+    -DCRYPTO_BACKEND=OpenSSL \
+    -DOPENSSL_ROOT_DIR=/opt/openssl-${TARGET_TRIPLE} \
+    -DBUILD_EXAMPLES=OFF \
+    -DBUILD_TESTING=OFF && \
+    cmake --build . --config Release -j$(nproc) && \
+    mkdir -p /output && \
+    cp src/libssh2.dll /output/ || cp src/libssh2-*.dll /output/libssh2.dll
+
+FROM scratch
+COPY --from=0 /output/* /
diff --git a/.github/scripts/build-native.sh b/.github/scripts/build-native.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+set -e
+
+PLATFORM=$1
+TARGET_TRIPLE=$2
+DOCKERFILE_PLATFORM=$3
+
+mkdir -p output
+
+if [[ "$PLATFORM" == win-* ]]; then
+  # Windows build using MinGW
+  docker buildx build \
+    --platform "$DOCKERFILE_PLATFORM" \
+    --build-arg TARGET_TRIPLE="$TARGET_TRIPLE" \
+    --output type=local,dest=./output \
+    -f .github/docker/windows.Dockerfile .
+
+elif [[ "$PLATFORM" == osx-* ]]; then
+  # macOS build using pre-built osxcross image
+  docker buildx build \
+    --platform "$DOCKERFILE_PLATFORM" \
+    --build-arg TARGET_TRIPLE="$TARGET_TRIPLE" \
+    --output type=local,dest=./output \
+    -f .github/docker/macos.Dockerfile .
+
+else
+  # Linux build
+  docker buildx build \
+    --platform "$DOCKERFILE_PLATFORM" \
+    --output type=local,dest=./output \
+    -f .github/docker/linux.Dockerfile .
+fi
+
+# Create runtime directory structure
+mkdir -p "NullOpsDevs.LibSsh/runtimes/$PLATFORM/native"
+
+# Copy library to correct location
+if [[ "$PLATFORM" == win-* ]]; then
+  cp output/libssh2.dll "NullOpsDevs.LibSsh/runtimes/$PLATFORM/native/"
+elif [[ "$PLATFORM" == osx-* ]]; then
+  cp output/libssh2.dylib "NullOpsDevs.LibSsh/runtimes/$PLATFORM/native/"
+else
+  # Copy and create symlink without version suffix
+  cp output/libssh2.so* "NullOpsDevs.LibSsh/runtimes/$PLATFORM/native/"
+  # Find the actual .so file and create a symlink
+  cd "NullOpsDevs.LibSsh/runtimes/$PLATFORM/native/"
+  if [ -f libssh2.so.1 ]; then
+    ln -sf libssh2.so.1 libssh2.so
+  fi
+fi
diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml
@@ -7,6 +7,8 @@ on:
     paths:
       - 'Native/libssh2/**'
       - '.github/workflows/build-native.yml'
+      - '.github/docker/**'
+      - '.github/scripts/**'
 
 jobs:
   build-all:
@@ -18,9 +20,6 @@ jobs:
           - platform: win-x64
             dockerfile_platform: linux/amd64
             target_triple: x86_64-w64-mingw32
-          - platform: win-x86
-            dockerfile_platform: linux/amd64
-            target_triple: i686-w64-mingw32
           - platform: linux-x64
             dockerfile_platform: linux/amd64
             target_triple: x86_64-linux-gnu
@@ -46,168 +45,8 @@ jobs:
 
       - name: Build libssh2
         run: |
-          mkdir -p output
-
-          # Determine build configuration based on platform
-          PLATFORM="${{ matrix.platform }}"
-          TARGET_TRIPLE="${{ matrix.target_triple }}"
-
-          if [[ "$PLATFORM" == win-* ]]; then
-            # Windows build using MinGW
-            docker buildx build \
-              --platform ${{ matrix.dockerfile_platform }} \
-              --build-arg TARGET_TRIPLE=$TARGET_TRIPLE \
-              --output type=local,dest=./output \
-              -f - . <<'EOF'
-          FROM debian:bookworm-slim
-          ARG TARGET_TRIPLE
-
-          RUN apt-get update && apt-get install -y \
-              build-essential \
-              cmake \
-              mingw-w64 \
-              wget \
-              && rm -rf /var/lib/apt/lists/*
-
-          # Download and build OpenSSL for Windows
-          WORKDIR /build
-          RUN wget https://www.openssl.org/source/openssl-3.0.15.tar.gz && \
-              tar xzf openssl-3.0.15.tar.gz && \
-              cd openssl-3.0.15 && \
-              ./Configure mingw64 --cross-compile-prefix=${TARGET_TRIPLE}- --prefix=/opt/openssl-${TARGET_TRIPLE} && \
-              make -j$(nproc) && \
-              make install_sw
-
-          # Build libssh2
-          COPY Native/libssh2 /src/libssh2
-          WORKDIR /src/libssh2/build
-
-          RUN cmake .. \
-              -DCMAKE_SYSTEM_NAME=Windows \
-              -DCMAKE_C_COMPILER=${TARGET_TRIPLE}-gcc \
-              -DCMAKE_RC_COMPILER=${TARGET_TRIPLE}-windres \
-              -DCMAKE_BUILD_TYPE=Release \
-              -DBUILD_SHARED_LIBS=ON \
-              -DENABLE_ZLIB_COMPRESSION=OFF \
-              -DCRYPTO_BACKEND=OpenSSL \
-              -DOPENSSL_ROOT_DIR=/opt/openssl-${TARGET_TRIPLE} \
-              -DBUILD_EXAMPLES=OFF \
-              -DBUILD_TESTING=OFF && \
-              cmake --build . --config Release -j$(nproc) && \
-              mkdir -p /output && \
-              cp src/libssh2.dll /output/ || cp src/libssh2-*.dll /output/libssh2.dll
-
-          FROM scratch
-          COPY --from=0 /output/* /
-          EOF
-
-          elif [[ "$PLATFORM" == osx-* ]]; then
-            # macOS build using osxcross
-            docker buildx build \
-              --platform ${{ matrix.dockerfile_platform }} \
-              --build-arg TARGET_TRIPLE=$TARGET_TRIPLE \
-              --output type=local,dest=./output \
-              -f - . <<'EOF'
-          FROM debian:bookworm-slim
-          ARG TARGET_TRIPLE
-
-          RUN apt-get update && apt-get install -y \
-              build-essential \
-              cmake \
-              git \
-              wget \
-              clang \
-              libssl-dev \
-              libxml2-dev \
-              llvm-dev \
-              uuid-dev \
-              zlib1g-dev \
-              libbz2-dev \
-              && rm -rf /var/lib/apt/lists/*
-
-          # Install osxcross
-          WORKDIR /opt
-          RUN git clone https://github.com/tpoechtrager/osxcross.git && \
-              cd osxcross && \
-              wget -nc https://github.com/joseluisq/macosx-sdks/releases/download/12.3/MacOSX12.3.sdk.tar.xz && \
-              mv MacOSX12.3.sdk.tar.xz tarballs/ && \
-              UNATTENDED=1 ./build.sh
-
-          ENV PATH="/opt/osxcross/target/bin:$PATH"
-
-          # Build libssh2
-          COPY Native/libssh2 /src/libssh2
-          WORKDIR /src/libssh2/build
-
-          RUN cmake .. \
-              -DCMAKE_SYSTEM_NAME=Darwin \
-              -DCMAKE_C_COMPILER=${TARGET_TRIPLE}-clang \
-              -DCMAKE_CXX_COMPILER=${TARGET_TRIPLE}-clang++ \
-              -DCMAKE_BUILD_TYPE=Release \
-              -DBUILD_SHARED_LIBS=ON \
-              -DENABLE_ZLIB_COMPRESSION=ON \
-              -DCRYPTO_BACKEND=OpenSSL \
-              -DBUILD_EXAMPLES=OFF \
-              -DBUILD_TESTING=OFF && \
-              cmake --build . --config Release -j$(nproc) && \
-              mkdir -p /output && \
-              cp src/libssh2*.dylib /output/libssh2.dylib
-
-          FROM scratch
-          COPY --from=0 /output/* /
-          EOF
-
-          else
-            # Linux build
-            docker buildx build \
-              --platform ${{ matrix.dockerfile_platform }} \
-              --output type=local,dest=./output \
-              -f - . <<'EOF'
-          FROM debian:bookworm-slim
-
-          RUN apt-get update && apt-get install -y \
-              build-essential \
-              cmake \
-              libssl-dev \
-              zlib1g-dev \
-              && rm -rf /var/lib/apt/lists/*
-
-          COPY Native/libssh2 /src/libssh2
-          WORKDIR /src/libssh2/build
-
-          RUN cmake .. \
-              -DCMAKE_BUILD_TYPE=Release \
-              -DBUILD_SHARED_LIBS=ON \
-              -DENABLE_ZLIB_COMPRESSION=ON \
-              -DCRYPTO_BACKEND=OpenSSL \
-              -DBUILD_EXAMPLES=OFF \
-              -DBUILD_TESTING=OFF && \
-              cmake --build . --config Release -j$(nproc) && \
-              mkdir -p /output && \
-              cp src/libssh2.so* /output/
-
-          FROM scratch
-          COPY --from=0 /output/* /
-          EOF
-          fi
-
-          # Create runtime directory structure
-          mkdir -p NullOpsDevs.LibSsh/runtimes/${{ matrix.platform }}/native
-
-          # Copy library to correct location
-          if [[ "$PLATFORM" == win-* ]]; then
-            cp output/libssh2.dll NullOpsDevs.LibSsh/runtimes/${{ matrix.platform }}/native/
-          elif [[ "$PLATFORM" == osx-* ]]; then
-            cp output/libssh2.dylib NullOpsDevs.LibSsh/runtimes/${{ matrix.platform }}/native/
-          else
-            # Copy and create symlink without version suffix
-            cp output/libssh2.so* NullOpsDevs.LibSsh/runtimes/${{ matrix.platform }}/native/
-            # Find the actual .so file and create a symlink
-            cd NullOpsDevs.LibSsh/runtimes/${{ matrix.platform }}/native/
-            if [ -f libssh2.so.1 ]; then
-              ln -sf libssh2.so.1 libssh2.so
-            fi
-          fi
+          chmod +x .github/scripts/build-native.sh
+          .github/scripts/build-native.sh "${{ matrix.platform }}" "${{ matrix.target_triple }}" "${{ matrix.dockerfile_platform }}"
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
