Run Rust tests on CircleCI

.circleci/config.yml

@@ -1,14 +1,84 @@
-version: 2
+version: 2.1
+
+commands:
+  build-libs:
+    steps:
+      - restore_cache:
+          name: Restore libs cache
+          keys:
+            - libs-cache-v2-{{ arch }}-{{ checksum "libs/build-all.sh" }}-{{ checksum "libs/build-openssl-desktop.sh" }}-{{ checksum "libs/build-sqlcipher-desktop.sh" }}
+      - run:
+          name: Build libs
+          command: |
+            sudo apt-get install tcl
+            pushd libs && ./build-all.sh desktop && popd
+            echo 'export OPENSSL_DIR=$(pwd)/libs/desktop/linux-x86-64/openssl' >> $BASH_ENV
+            echo 'export SQLCIPHER_LIB_DIR=$(pwd)/libs/desktop/linux-x86-64/sqlcipher/lib' >> $BASH_ENV
+            echo 'export SQLCIPHER_INCLUDE_DIR=$(pwd)/libs/desktop/linux-x86-64/sqlcipher/include' >> $BASH_ENV
+      - save_cache:
+          name: Save libs cache
+          key: libs-cache-v2-{{ arch }}-{{ checksum "libs/build-all.sh" }}-{{ checksum "libs/build-openssl-desktop.sh" }}-{{ checksum "libs/build-sqlcipher-desktop.sh" }}
+          paths:
+            - libs/desktop
+  rust-tests:
+    parameters:
+      rust-version:
+        type: string
+        default: "stable"
+    steps:
+      - checkout
+      - build-libs
+      - run:
+          name: Rust setup
+          command: |
+            rustup install <<parameters.rust-version>>
+            rustup default <<parameters.rust-version>>
+            rustc --version
+      # Test with 1. only default features on, 2. all features on, 3. no features on.
+      # This is not perfect (really we want the cartesian product), but is good enough in practice.
+      - run:
+          name: Test
+          command: cargo test --all --verbose
+      - run:
+          name: Test (all features)
+          command: cargo test --all --all-features --verbose
+      - run:
+          name: Test (no default features)
+          command: cargo test --all --no-default-features --verbose
+
 jobs:
-  rustfmt:
+  Check Rust formatting:
     docker:
       - image: circleci/rust:latest
     steps:
       - checkout
       - run: rustup component add rustfmt
       - run: cargo fmt -- --check
+  Rust tests - stable:
+    docker:
+      - image: circleci/rust:latest
+    steps:
+      - rust-tests
+  Rust tests - beta:
+    docker:
+      - image: circleci/rust:latest
+    steps:
+      - rust-tests:
+          rust-version: "beta"
+  Rust tests - nightly:
+    docker:
+      - image: circleci/rust:latest
+    steps:
+      - rust-tests:
+          rust-version: "nightly"
+
 workflows:
   version: 2
-  check_formating:
+  check-formating:
     jobs:
-      - rustfmt
+      - Check Rust formatting
+  run-tests:
+    jobs:
+      - Rust tests - stable
+      - Rust tests - beta
+      - Rust tests - nightly

.travis.yml

@@ -1,18 +1,3 @@
-language: rust
-# We use OSX so that we can get a reasonably up to date version of SQLCipher.
-# (The version in Travis's default Ubuntu Trusty is much too old).
-os: osx
-osx_image:
-  - xcode10.1
-rust:
-  - stable
-  - beta
-  - nightly
-cache: cargo
-matrix:
-  allow_failures:
-    - rust: nightly
-  fast_finish: true
 env:
   global:
     - FRAMEWORK_NAME=ApplicationServices.framework.zip
@@ -25,19 +10,18 @@ before_deploy:
   - carthage build --no-skip-current --verbose
   - carthage archive --output $FRAMEWORK_NAME
   - rm -rf Carthage
-script:
-  # Test with 1. only default features on, 2. all features on, 3. no features on.
-  # This is not perfect (really we want the cartesian product), but is good enough in practice.
-  - cargo test --all --verbose
-  - cargo test --all --all-features --verbose
-  - cargo test --all --no-default-features --verbose
 
 jobs:
   include:
     - stage: Carthage framework GitHub Release
       if: tag IS present
+      language: rust
       rust: stable
+      # We use OSX so that we can get a reasonably up to date version of SQLCipher.
+      # (The version in Travis's default Ubuntu Trusty is much too old).
+      os: osx
       osx_image: xcode10.1
+      if: tag IS present
       script: skip # Do not re-run tests
       deploy:
         provider: releases

libs/build-openssl-desktop.sh

@@ -9,9 +9,9 @@ export -f abspath
 
 if [ "$#" -lt 1 -o "$#" -gt 2 ]
 then
-    echo "Usage:"
-    echo "./build-openssl-desktop.sh <OPENSSL_SRC_PATH> [CROSS_COMPILE_TARGET]"
-    exit 1
+  echo "Usage:"
+  echo "./build-openssl-desktop.sh <OPENSSL_SRC_PATH> [CROSS_COMPILE_TARGET]"
+  exit 1
 fi
 
 OPENSSL_SRC_PATH=$1

libs/build-sqlcipher-desktop.sh

@@ -5,7 +5,7 @@ set -euvx
 abspath () { case "$1" in /*)printf "%s\\n" "$1";; *)printf "%s\\n" "$PWD/$1";; esac; }
 export -f abspath
 
-if [ "$#" -lt 1 -o "$#" -gt 2 -o ]
+if [ "$#" -lt 1 -o "$#" -gt 2 ]
 then
   echo "Usage:"
   echo "./build-sqlcipher-desktop.sh <SQLCIPHER_SRC_PATH> [CROSS_COMPILE_TARGET]"