Merge pull request #25 from Dushistov/ios-support

ios/feature: it compiles for iOS, but don't work yet

Author: Dushistov

.github/workflows/main.yml

@@ -26,7 +26,6 @@ jobs:
       RUSTUP_MAX_RETRIES: 10
       CARGO_NET_RETRY: 10
     steps:
-
       - uses: actions/checkout@v2
         with:
           submodules: 'recursive'
@@ -67,12 +66,56 @@ jobs:
           cd $GITHUB_WORKSPACE
           python ci/build_and_run_tests.py --rust-only
         shell: bash
+  ios-tests:
+    name: Check work with iOS
+    runs-on:
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [macos-latest]
+        rust: [stable, beta]
+    env:
+      RUSTUP_MAX_RETRIES: 10
+      CARGO_NET_RETRY: 10
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          profile: minimal
+          override: true
+          target: "aarch64-apple-ios"
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.8.2'
+      - uses: jwlawson/actions-setup-cmake@v1.0
+        with:
+          cmake-version: '3.15.4'
+          github-api-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Check versions
+        run: |
+          set -e
+          cargo --version
+          rustc --version
+          python --version
+          cmake --version
+          echo "end of versions checking"
+        shell: bash
+      - name: Run tests
+        run: |
+          set -e
+          cd $GITHUB_WORKSPACE
+          python ci/build_and_run_tests.py --rust-ios-only
+        shell: bash
+  # Rebuild C++ part here, because of in build.rs we don't build unit tests
   cpp-tests:
     name: C++ tests
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
-
       matrix:
         os: [ubuntu-latest, macos-latest]
     steps:

ci/build_and_run_tests.py

@@ -46,22 +46,35 @@ def build_and_test_rust_part(src_root: str):
     check_call(["cargo", "test", "--all", "-vv"], cwd = src_root)
     print("running tests in release mode")
     check_call(["cargo", "test", "--all", "--release", "-vv"], cwd = src_root)
+    check_call(["cargo", "build", "-p", "chat-demo"], cwd = src_root)
+
+@show_timing
+def build_and_test_rust_part_for_ios(src_root: str):
+    print("build for iOS")
+    check_call(["cargo", "build", "--target=aarch64-apple-ios", "-p", "chat-demo"], cwd = src_root)
 
 @show_timing
 def main():
     ci_dir = Path(get_src_root_path(sys.argv[0]))
     src_root = ci_dir.parent
     CPP_TESTS = "cpp"
     RUST_TESTS = "rust"
+    RUST_IOS_TESTS = "rust-ios"
     tests = set([CPP_TESTS, RUST_TESTS])
-    if len(sys.argv) >= 2 and sys.argv[1] == "--rust-only":
-        tests = set([RUST_TESTS])
-    if len(sys.argv) >= 2 and sys.argv[1] == "--cpp-only":
-        tests = set([CPP_TESTS])
+    if len(sys.argv) >= 2:
+        if sys.argv[1] == "--rust-only":
+            tests = set([RUST_TESTS])
+        elif sys.argv[1] == "--cpp-only":
+            tests = set([CPP_TESTS])
+        elif sys.argv[1] == "--rust-ios-only":
+            tests = set([RUST_IOS_TESTS])
+
     if CPP_TESTS in tests:
         build_and_test_cpp_part(src_root)
     if RUST_TESTS in tests:
         build_and_test_rust_part(src_root)
+    if RUST_IOS_TESTS in tests:
+        build_and_test_rust_part_for_ios(src_root)
 
 if __name__ == "__main__":
     main()

couchbase-lite-core-sys/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-cmake = "0.1.42"
+cmake = "=0.1.43"
 bindgen = "0.53.2"
-cc = "1.0.53"
+cc = "1.0.53"
+env_logger = "0.7"

couchbase-lite-core-sys/build.rs

@@ -7,6 +7,7 @@ use std::{
 };
 
 fn main() {
+    env_logger::init();
     let dst = cmake::Config::new(Path::new("couchbase-lite-core"))
         .define("DISABLE_LTO_BUILD", "True")
         .define("SANITIZE_FOR_DEBUG_ENABLED", "False")
@@ -170,6 +171,14 @@ fn run_bindgen_for_c_headers<P: AsRef<Path>>(
         .prepend_enum_name(true)
         .size_t_is_usize(true)
         .rustfmt_bindings(false);
+
+    //see https://github.com/rust-lang/rust-bindgen/issues/1211
+    bindings = if target == "aarch64-apple-ios" {
+        bindings.clang_arg("--target=arm64-apple-ios")
+    } else {
+        bindings
+    };
+
     bindings = include_dirs.iter().fold(bindings, |acc, x| {
         acc.clang_arg("-I".to_string() + x.as_ref().to_str().unwrap())
     });