[eclipse-iceoryx#210] Extend CI for FFI builds

elBoberido · Jun 13, 2024 · c2a6e1e · c2a6e1e
1 parent c312b93
commit c2a6e1e
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 9 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -84,6 +84,38 @@ iox2_common_build_and_test_no_doc_tests_release_template: &IOX2_COMMON_BUILD_AND
   <<: *IOX2_COMMON_BUILD_RELEASE
   test_script: cargo nextest run --release --tests --workspace --no-fail-fast
 
+iox2_ffi_common_debug_template: &IOX2_FFI_COMMON_DEBUG
+  ffi_script:
+    - cmake -B target/ffi/build \
+            -H. \
+            -DCMAKE_INSTALL_PREFIX=target/ffi/install \
+            -DEXAMPLES=ON \
+            -DCMAKE_BUILD_TYPE="Debug"
+    - cmake --build target/ffi/build
+    - cmake --install target/ffi/build
+    - rm -rf target/ffi/build
+    - cmake -B target/ffi/out-of-tree \
+            -Hexamples/c/ \
+            -DCMAKE_PREFIX_PATH=$( pwd )/target/ffi/install \
+            -DCMAKE_BUILD_TYPE="Debug"
+    - cmake --build target/ffi/out-of-tree
+
+iox2_ffi_common_release_template: &IOX2_FFI_COMMON_RELEASE
+  ffi_script:
+    - cmake -B target/ffi/build \
+            -H. \
+            -DCMAKE_INSTALL_PREFIX=target/ffi/install \
+            -DEXAMPLES=ON \
+            -DCMAKE_BUILD_TYPE="Release"
+    - cmake --build target/ffi/build
+    - cmake --install target/ffi/build
+    - rm -rf target/ffi/build
+    - cmake -B target/ffi/out-of-tree \
+            -Hexamples/c/ \
+            -DCMAKE_PREFIX_PATH=$( pwd )/target/ffi/install \
+            -DCMAKE_BUILD_TYPE="Release"
+    - cmake --build target/ffi/out-of-tree
+
 iox2_freebsd_setup_template: &IOX2_FREEBSD_SETUP
   setup_script:
     - uname -a
@@ -206,6 +238,7 @@ ubuntu_22_04_aarch64_stable_debug_task:
   set_toolchain_script: rustup default stable
   <<: *IOX2_CARGO_FMT_AND_CLIPPY
   <<: *IOX2_COMMON_BUILD_AND_TEST_DEBUG
+  <<: *IOX2_FFI_COMMON_DEBUG
 
 ubuntu_22_04_aarch64_beta_debug_task:
   depends_on: ubuntu_22_04_aarch64_stable_debug
@@ -223,6 +256,7 @@ ubuntu_22_04_aarch64_stable_release_task:
   <<: *IOX2_CONTAINER_UBUNTU_22_04_AARCH64
   set_toolchain_script: rustup default stable
   <<: *IOX2_COMMON_BUILD_AND_TEST_NO_DOC_TESTS_RELEASE
+  <<: *IOX2_FFI_COMMON_RELEASE
 
 #
 # Arch Linux x86
@@ -237,6 +271,7 @@ arch_linux_x64_stable_debug_task:
   set_toolchain_script: rustup default stable
   <<: *IOX2_CARGO_FMT_AND_CLIPPY
   <<: *IOX2_COMMON_BUILD_AND_TEST_DEBUG
+  <<: *IOX2_FFI_COMMON_DEBUG
 
 arch_linux_x64_beta_debug_task:
   depends_on: arch_linux_x64_stable_debug
@@ -254,6 +289,7 @@ arch_linux_x64_stable_release_task:
   <<: *IOX2_CONTAINER_ARCH_LINUX_X64
   set_toolchain_script: rustup default stable
   <<: *IOX2_COMMON_BUILD_AND_TEST_NO_DOC_TESTS_RELEASE
+  <<: *IOX2_FFI_COMMON_RELEASE
 
 #
 # Windows Server 2019 x86

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -104,8 +104,10 @@ jobs:
         mode: 
           - name: "release"
             arg: "--release"
+            cmake_build_type: "Release"
           - name: "debug"
             arg: ""
+            cmake_build_type: "Debug"
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}
     steps:
@@ -125,29 +127,61 @@ jobs:
           artifact-bin-name: cargo-nextest
           artifact-upload-name: ${{ runner.os }}-cargo-nextest
 
-      - name: Prepare system
-        run: ${{ matrix.os == 'windows-latest' && 'internal\scripts\ci_prepare_windows.bat' || ( matrix.os == 'ubuntu-latest' && './internal/scripts/ci_prepare_ubuntu.sh' || 'uname -a' ) }}
+      - if: ${{ matrix.os == 'windows-latest' }}
+        name: Prepare Windows
+        run: internal\scripts\ci_prepare_windows.bat
+      - if: ${{ matrix.os == 'ubuntu-latest' }}
+        name: Prepare Linux
+        run: |
+            internal/scripts/ci_prepare_ubuntu.sh
+            uname -a
 
       - name: Run cargo build
         run: cargo build --workspace --all-targets ${{ matrix.mode.arg }} --target i686-unknown-linux-gnu
 
       - name: Run cargo nextest
         run: cargo nextest run --workspace --no-fail-fast ${{ matrix.mode.arg }} --target i686-unknown-linux-gnu
 
+      - name: Build language bindings
+        run: |
+          cmake -B target/ffi/build \
+                -H. \
+                -DCMAKE_INSTALL_PREFIX=target/ffi/install \
+                -DEXAMPLES=ON \
+                -DCMAKE_BUILD_TYPE=${{ matrix.mode.cmake_build_type }} \
+                -DRUST_TARGET_TRIPLET="i686-unknown-linux-gnu" \
+                -DCMAKE_C_FLAGS="-m32"
+          cmake --build target/ffi/build
+          cmake --install target/ffi/build
+
+      - name: Build language binding examples in out-of-tree configuration
+        if: false # out-of-tree cross-compilation is currently not supported
+        run: |
+          rm -rf target/ffi/build
+          cmake -B target/ffi/out-of-tree \
+                -Hexamples/c/ \
+                -DCMAKE_PREFIX_PATH=${{ github.workspace }}/target/ffi/install \
+                -DCMAKE_BUILD_TYPE=${{ matrix.mode.cmake_build_type }} \
+                -DCMAKE_C_FLAGS="-m32"
+          cmake --build target/ffi/out-of-tree
+
   x86_64:
     needs: [preflight-check, static-code-analysis, cargo-nextest]
     if: ${{ needs.changes.outputs.source-code == 'true' }}
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        toolchain: [stable, 1.75.0]
+        toolchain: [stable, stable-gnu, 1.75.0]
         mode: 
           - name: "release"
             arg: "--release"
+            cmake_build_type: "Release"
           - name: "debug"
             arg: ""
+            cmake_build_type: "Debug"
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}
+    if: ${{ matrix.toolchain != 'stable-gnu' || matrix.os == 'windows-latest' }}
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -164,8 +198,14 @@ jobs:
           artifact-bin-name: cargo-nextest
           artifact-upload-name: ${{ runner.os }}-cargo-nextest
 
-      - name: Prepare system
-        run: ${{ matrix.os == 'windows-latest' && 'internal\scripts\ci_prepare_windows.bat' || ( matrix.os == 'ubuntu-latest' && './internal/scripts/ci_prepare_ubuntu.sh' || 'uname -a' ) }}
+      - if: ${{ matrix.os == 'windows-latest' }}
+        name: Prepare Windows
+        run: internal\scripts\ci_prepare_windows.bat
+      - if: ${{ matrix.os == 'ubuntu-latest' }}
+        name: Prepare Linux
+        run: |
+            internal/scripts/ci_prepare_ubuntu.sh
+            uname -a
 
       - name: Run cargo build
         run: cargo build --workspace --all-targets ${{ matrix.mode.arg }}
@@ -175,13 +215,21 @@ jobs:
 
       - name: Build language bindings
         run: |
-          cmake -B target/ffi/build -DCMAKE_INSTALL_PREFIX=target/ffi/install -DEXAMPLES=ON .
+          cmake -B target/ffi/build \
+                -H. \
+                -DCMAKE_INSTALL_PREFIX=target/ffi/install \
+                -DEXAMPLES=ON \
+                -DCMAKE_BUILD_TYPE=${{ matrix.mode.cmake_build_type }}
           cmake --build target/ffi/build
           cmake --install target/ffi/build
 
       - name: Build language binding examples in out-of-tree configuration
         run: |
-          cmake -B target/ffi/out-of-tree -Hexamples/c/ -DCMAKE_PREFIX_PATH=${{ github.workspace }}/target/ffi/install
+          rm -rf target/ffi/build
+          cmake -B target/ffi/out-of-tree \
+                -Hexamples/c/ \
+                -DCMAKE_PREFIX_PATH=${{ github.workspace }}/target/ffi/install \
+                -DCMAKE_BUILD_TYPE=${{ matrix.mode.cmake_build_type }}
           cmake --build target/ffi/out-of-tree
 
   x86_64_unstable:
@@ -215,8 +263,14 @@ jobs:
           artifact-bin-name: cargo-nextest
           artifact-upload-name: ${{ runner.os }}-cargo-nextest
 
-      - name: Prepare system
-        run: ${{ matrix.os == 'windows-latest' && 'internal\scripts\ci_prepare_windows.bat' || ( matrix.os == 'ubuntu-latest' && './internal/scripts/ci_prepare_ubuntu.sh' || 'uname -a' ) }}
+      - if: ${{ matrix.os == 'windows-latest' }}
+        name: Prepare Windows
+        run: internal\scripts\ci_prepare_windows.bat
+      - if: ${{ matrix.os == 'ubuntu-latest' }}
+        name: Prepare Linux
+        run: |
+            internal/scripts/ci_prepare_ubuntu.sh
+            uname -a
 
       - name: Run cargo build
         run: cargo build --workspace --all-targets ${{ matrix.mode.arg }}
@@ -275,8 +329,26 @@ jobs:
             export RUSTFLAGS="-C debug-assertions"
             cargo fmt --all -- --check
             cargo clippy -- -D warnings
+            echo "###################"
+            echo "# Run cargo build #"
+            echo "###################"
             cargo build --workspace --all-targets ${{ matrix.mode }}
+            echo "######################"
+            echo "# Run cargo nextest #"
+            echo "#####################"
             cargo nextest run --workspace --no-fail-fast ${{ matrix.mode }}
+            echo "###########################"
+            echo "# Build language bindings #"
+            echo "###########################"
+            cmake -B target/ffi/build -H. -DCMAKE_INSTALL_PREFIX=target/ffi/install -DEXAMPLES=ON
+            cmake --build target/ffi/build
+            cmake --install target/ffi/build
+            echo "################################################################"
+            echo "# Build language binding examples in out-of-tree configuration #"
+            echo "################################################################"
+            rm -rf target/ffi/build
+            cmake -B target/ffi/out-of-tree -Hexamples/c/ -DCMAKE_PREFIX_PATH=${{ github.workspace }}/target/ffi/install
+            cmake --build target/ffi/out-of-tree
 
   grcov:
     needs: [preflight-check, static-code-analysis]

diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt
@@ -10,6 +10,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
+# elfenpiff is stupid
+
 cmake_minimum_required(VERSION 3.28)
 project(examples_c LANGUAGES C)
 

diff --git a/internal/docker/archlinux-base-devel b/internal/docker/archlinux-base-devel
@@ -11,6 +11,8 @@ ENV PATH="/root/.cargo/bin:$PATH"
 RUN echo "#### Installing dependencies" \
   && pacman -Syu --noconfirm \
        clang \
+       cmake \
+       gcc \
        git \
   && pacman -Scc --noconfirm \
   && echo "#### Install minimal Rust toolchain" \

diff --git a/internal/docker/ubuntu-22.04 b/internal/docker/ubuntu-22.04
@@ -14,7 +14,10 @@ ENV PATH="/root/.cargo/bin:$PATH"
 RUN echo "#### Installing dependencies" \
   && apt update && apt install -y \
        clang \
+       cmake \
        curl \
+       gcc \
+       g++ \
        git \
        libacl1-dev \
   && rm -rf /var/lib/apt/lists/* \