Build variants in parallel

Author: eddymoulton

.github/workflows/ci.yml

@@ -12,37 +12,64 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     env:
-      RID: ${{ matrix.name }}
+      RID: ${{ matrix.rid }}
+      VARIANT: ${{ matrix.variant }}
     strategy:
       matrix:
         include:
           - os: windows-2022
             name: win-x86
+            rid: win-x86
             param: -x86
           - os: windows-2022
             name: win-x64
+            rid: win-x64
             param: -x64
           - os: windows-2022
             name: win-arm64
+            rid: win-arm64
             param: -arm64
           - os: ubuntu-24.04
             name: linux-x64
+            rid: linux-x64
+          - os: ubuntu-24.04
+            name: linux-x64-openssl1.1
+            rid: linux-x64
+            variant: openssl1.1
           - os: ubuntu-24.04
             name: linux-arm
+            rid: linux-arm
+          - os: ubuntu-24.04
+            name: linux-arm-openssl1.1
+            rid: linux-arm
+            variant: openssl1.1
           - os: ubuntu-24.04
             name: linux-arm64
+            rid: linux-arm64
+          - os: ubuntu-24.04
+            name: linux-arm64-openssl1.1
+            rid: linux-arm64
+            variant: openssl1.1
+          # debian:bullseye-slim has no ppc64le manifest, so the openssl1.1
+          # variant is omitted for this RID.
           - os: ubuntu-24.04
             name: linux-ppc64le
+            rid: linux-ppc64le
           - os: ubuntu-24.04
             name: linux-musl-x64
+            rid: linux-musl-x64
           - os: ubuntu-24.04
             name: linux-musl-arm
+            rid: linux-musl-arm
           - os: ubuntu-24.04
             name: linux-musl-arm64
+            rid: linux-musl-arm64
           - os: macos-26-intel
             name: osx-x64
+            rid: osx-x64
           - os: macos-26
             name: osx-arm64
+            rid: osx-arm64
       fail-fast: false
     steps:
       - name: Checkout
@@ -56,7 +83,7 @@ jobs:
         if: runner.os == 'macOS'
         run: ./build.libgit2.sh
       - name: Setup QEMU
-        if: runner.os == 'Linux' && (matrix.name == 'linux-arm' || matrix.name == 'linux-arm64' || matrix.name == 'linux-ppc64le' || matrix.name == 'linux-musl-arm' || matrix.name == 'linux-musl-arm64')
+        if: runner.os == 'Linux' && (matrix.rid == 'linux-arm' || matrix.rid == 'linux-arm64' || matrix.rid == 'linux-ppc64le' || matrix.rid == 'linux-musl-arm' || matrix.rid == 'linux-musl-arm64')
         uses: docker/setup-qemu-action@v4
       - name: Set up Docker Buildx
         if: runner.os == 'Linux'
@@ -68,7 +95,7 @@ jobs:
         uses: actions/upload-artifact@v7.0.0
         with:
           name: ${{ matrix.name }}
-          path: nuget.package/runtimes/${{ matrix.name }}
+          path: nuget.package/runtimes/${{ matrix.rid }}
   package:
     name: Create package
     needs: build
@@ -103,6 +130,17 @@ jobs:
         uses: actions/download-artifact@v8.0.1
         with:
           path: nuget.package/runtimes/
+      - name: Merge variant artifacts into RID directories
+        shell: bash
+        run: |
+          cd nuget.package/runtimes
+          for d in *-openssl1.1; do
+            [[ -d "$d" ]] || continue
+            rid="${d%-openssl1.1}"
+            mkdir -p "$rid/native"
+            mv "$d/native/"* "$rid/native/"
+            rm -rf "$d"
+          done
       - name: Create package
         run: dotnet pack nuget.package ${{ steps.version.outputs.override && format('/p:MinVerVersionOverride={0}', steps.version.outputs.override) || '' }}
       - name: Upload NuGet package

dockerbuild.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -e
-echo "building for $RID"
+echo "building for $RID variant=${VARIANT:-default}"
 
 # Map RID to Docker platform for native builds (no cross-compilation).
 if [[ $RID =~ arm64 ]]; then
@@ -40,18 +40,12 @@ mkdir -p nuget.package/runtimes/$RID/native
 if [[ $RID == linux-musl* ]]; then
     build_in_container "$RID" "Dockerfile.linux-musl" "" ""
     extract_runtimes "$RID"
-elif [[ $RID == linux-ppc64le ]]; then
-    # debian:bullseye-slim has no ppc64le manifest, so we skip the openssl1.1
-    # variant on this arch and ship only the default OpenSSL 3 build.
-    build_in_container "$RID" "Dockerfile.linux" "" ""
-    extract_runtimes "$RID"
+elif [[ "$VARIANT" == "openssl1.1" ]]; then
+    # Built on bullseye against OpenSSL 1.1, libssh2 statically linked.
+    build_in_container "$RID-openssl1.1" "Dockerfile.linux-static-libssh2" "openssl1.1" "debian:bullseye-slim"
+    extract_runtimes "$RID-openssl1.1"
 else
-    # All glibc-based Linux RIDs get two variants:
-    #   1. Default: built on bookworm against OpenSSL 3, libssh2 bundled as a separate .so
-    #   2. openssl1.1: built on bullseye against OpenSSL 1.1, libssh2 statically linked
+    # Default: built on bookworm against OpenSSL 3, libssh2 bundled as a separate .so.
     build_in_container "$RID" "Dockerfile.linux" "" ""
     extract_runtimes "$RID"
-
-    build_in_container "$RID-openssl1.1" "Dockerfile.linux-static-libssh2" "openssl1.1" "debian:bullseye-slim"
-    extract_runtimes "$RID-openssl1.1"
 fi