Merge pull request #56 from stepfunc/feature/ci-update

Update CI

Author: emgre

.github/workflows/ci.yml

@@ -5,6 +5,7 @@ on:
       - master
   pull_request:
 jobs:
+  # Run the unit tests on Windows and Linux
   test:
     strategy:
       fail-fast: false
@@ -43,6 +44,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
+  # Check formatting and run clippy lints
   linting:
     strategy:
       fail-fast: false
@@ -71,13 +73,14 @@ jobs:
         with:
           command: clippy
           args: -- -D warnings
+  # Build bindings on Windows x64 and Linux x64
   bindings:
     strategy:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
-          - windows-latest
+          - ubuntu-latest # 64-bit Linux (kernel 2.6.32+, glibc 2.11+) (x86_64-unknown-linux-gnu)
+          - windows-latest # 64-bit MSVC (Windows 7+) (x86_64-pc-windows-msvc)
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -122,18 +125,69 @@ jobs:
         with:
           command: run
           args: --release --bin foo-bindings -- --java
-      - name: Upload compiled C bindings
+      - name: Upload compiled C bindings (Windows)
+        if: ${{ runner.os == 'Windows' }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: ffi-modules
+          path: tests/bindings/c/generated/x86_64-pc-windows-msvc/lib
+      - name: Upload compiled C bindings (Linux)
+        if: ${{ runner.os == 'Linux' }}
         uses: actions/upload-artifact@v2
         with:
           name: ffi-modules
-          path: tests/bindings/c/generated/lib
+          path: tests/bindings/c/generated/x86_64-unknown-linux-gnu/lib
       - name: Upload compiled Java bindings
         uses: actions/upload-artifact@v2
         with:
           name: ffi-modules
           path: tests/bindings/java/foo/src/main/resources
+  # Cross-compilation for ARM devices and produce C bindings
+  cross:
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - arm-unknown-linux-gnueabi # ARMv6 Linux (kernel 3.2, glibc 2.17)
+          - arm-unknown-linux-gnueabihf # ARMv6 Linux, hardfloat (kernel 3.2, glibc 2.17)
+          - armv7-unknown-linux-gnueabihf # ARMv7 Linux, hardfloat (kernel 3.2, glibc 2.17)
+          - aarch64-unknown-linux-gnu # ARM64 Linux (kernel 4.2, glibc 2.17+)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: ${{ matrix.target }}
+          override: true
+      - name: Update dependencies
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: update
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: build
+          args: --release --target ${{ matrix.target }}
+      - name: C bindings
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: run
+          args: --release --target ${{ matrix.target }} --bin foo-bindings -- --c --no-tests
+      - name: Upload compiled C bindings
+        uses: actions/upload-artifact@v2
+        with:
+          name: ffi-modules
+          path: tests/bindings/c/generated/${{ matrix.target }}/lib
+  # Package all the generated bindings
   packaging:
-    needs: bindings
+    needs: [bindings, cross]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

ci-script/build.rs

@@ -6,10 +6,18 @@ fn main() {
         "cargo:rustc-env=TARGET_DIR={}",
         get_target_directory().unwrap().to_string_lossy()
     );
+    println!(
+        "cargo:rustc-env=TARGET_TRIPLE={}",
+        get_target_triple().unwrap()
+    );
     println!("cargo:rustc-env=PROFILE={}", var("PROFILE").unwrap());
 }
 
 fn get_target_directory() -> Option<PathBuf> {
     let path = PathBuf::from(var("OUT_DIR").ok()?);
     Some(path.parent()?.parent()?.parent()?.to_owned())
 }
+
+fn get_target_triple() -> Option<String> {
+    var("TARGET").ok()
+}

ci-script/src/lib.rs

@@ -82,28 +82,27 @@ fn run_builder<'a, B: BindingBuilder<'a>>(
 ) -> B {
     let mut platforms = PlatformLocations::new();
     if let Some(package_src) = package_src {
-        let platform_path = [package_src, Platform::Win64.to_string()]
-            .iter()
-            .collect::<PathBuf>();
-        if platform_path.is_dir() {
-            platforms.add(Platform::Win64, platform_path);
-        }
-
-        let platform_path = [package_src, Platform::Linux.to_string()]
-            .iter()
-            .collect::<PathBuf>();
-        if platform_path.is_dir() {
-            platforms.add(Platform::Linux, platform_path);
-        }
+        let mut check_platform = |platform: Platform| {
+            let platform_path = [package_src, platform.to_string()]
+                .iter()
+                .collect::<PathBuf>();
+            if platform_path.is_dir() {
+                platforms.add(platform, platform_path);
+            }
+        };
 
-        let platform_path = [package_src, Platform::LinuxMusl.to_string()]
-            .iter()
-            .collect::<PathBuf>();
-        if platform_path.is_dir() {
-            platforms.add(Platform::LinuxMusl, platform_path);
-        }
+        check_platform(Platform::WinX64Msvc);
+        check_platform(Platform::LinuxX64Gnu);
+        check_platform(Platform::LinuxX64Musl);
+        check_platform(Platform::LinuxArm6Gnueabi);
+        check_platform(Platform::LinuxArm6GnueabiHf);
+        check_platform(Platform::LinuxArm7GnueabiHf);
+        check_platform(Platform::LinuxArm8Gnu);
     } else {
-        platforms.add(Platform::current(), ffi_path());
+        platforms.add(
+            Platform::from_target_triple(env!("TARGET_TRIPLE")).expect("Unsupported platform"),
+            ffi_path(),
+        );
     }
 
     if platforms.is_empty() {
@@ -124,11 +123,9 @@ fn run_builder<'a, B: BindingBuilder<'a>>(
 
     builder.generate(package);
 
-    if !package {
+    if !package && run_tests {
         builder.build();
-        if run_tests {
-            builder.test();
-        }
+        builder.test();
     } else {
         builder.package();
     }
@@ -161,13 +158,10 @@ struct CBindingBuilder<'a> {
 
 impl<'a> CBindingBuilder<'a> {
     fn build_doxygen(&self) {
-        let mut platforms = PlatformLocations::new();
-        platforms.add(Platform::current(), ffi_path());
-
         let config = c_oo_bindgen::CBindgenConfig {
             output_dir: self.output_dir(),
             ffi_name: self.settings.ffi_name.to_owned(),
-            platforms,
+            platforms: self.platforms.clone(),
         };
 
         c_oo_bindgen::generate_doxygen(&self.settings.library, &config)
@@ -206,9 +200,6 @@ impl<'a> BindingBuilder<'a> for CBindingBuilder<'a> {
     }
 
     fn generate(&mut self, _is_packaging: bool) {
-        let mut platforms = PlatformLocations::new();
-        platforms.add(Platform::current(), ffi_path());
-
         let config = c_oo_bindgen::CBindgenConfig {
             output_dir: self.output_dir(),
             ffi_name: self.settings.ffi_name.to_owned(),
@@ -255,7 +246,7 @@ impl<'a> BindingBuilder<'a> for CBindingBuilder<'a> {
     }
 
     fn package(&mut self) {
-        // Already done in build
+        // Already done in generate
     }
 }