Merge pull request #145 from stevenroose/less-travis-jobs

Use less Travis jobs

Author: stevenroose

.travis.yml

@@ -1,15 +1,24 @@
 language: rust
-rust:
-  - stable
-  - nightly
-  - 1.29.0
-env:
-  - BITCOINVERSION=0.18.0
-  - BITCOINVERSION=0.18.1
-  - BITCOINVERSION=0.19.0.1
-  - BITCOINVERSION=0.19.1
-  - BITCOINVERSION=0.20.0
-  - BITCOINVERSION=0.20.1
+
+jobs:
+  include:
+    - rust: stable
+      env: RUSTFMTCHECK=true
+    - rust: nightly
+    - rust: 1.29.0
+    # Integration tests
+    - rust: stable
+      env: BITCOINVERSION=0.18.0
+    - rust: stable
+      env: BITCOINVERSION=0.18.1
+    - rust: stable
+      env: BITCOINVERSION=0.19.0.1
+    - rust: stable
+      env: BITCOINVERSION=0.19.1
+    - rust: stable
+      env: BITCOINVERSION=0.20.0
+    - rust: stable
+      env: BITCOINVERSION=0.20.1
 
 script:
   - ./contrib/test.sh

contrib/test.sh

@@ -1,4 +1,13 @@
 
+set -xe
+
+# Just echo all the relevant env vars to help debug Travis.
+echo "TRAVIS_RUST_VERSION: \"$TRAVIS_RUST_VERSION\""
+echo "RUSTFMTCHECK: \"$RUSTFMTCHECK\""
+echo "BITCOINVERSION: \"$BITCOINVERSION\""
+echo "PATH: \"$PATH\""
+
+
 # Pin dependencies for Rust v1.29
 if [ "$TRAVIS_RUST_VERSION" = "1.29.0" ]; then
     cargo generate-lockfile --verbose
@@ -10,18 +19,22 @@ if [ "$TRAVIS_RUST_VERSION" = "1.29.0" ]; then
     cargo update --verbose --package "serde_derive" --precise "1.0.98"
 fi
 
-if [ "$TRAVIS_RUST_VERSION" = "stable" ]; then
+if [ -n "$RUSTFMTCHECK" ]; then
   rustup component add rustfmt
   cargo fmt --all -- --check
 fi
 
+# Integration test.
+if [ -n "$BITCOINVERSION" ]; then
+    wget https://bitcoincore.org/bin/bitcoin-core-$BITCOINVERSION/bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
+    tar -xzvf bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
+    export PATH=$PATH:$(pwd)/bitcoin-$BITCOINVERSION/bin
+    cd integration_test
+    ./run.sh
+    exit 0
+fi
+
+# Regular build/unit test.
 cargo build --verbose
 cargo test --verbose
 cargo build --verbose --examples
-
-# Integration test
-wget https://bitcoincore.org/bin/bitcoin-core-$BITCOINVERSION/bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
-tar -xzvf bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz
-export PATH=$PATH:$(pwd)/bitcoin-$BITCOINVERSION/bin
-(cd integration_test && ./run.sh)
-

integration_test/src/main.rs

@@ -311,10 +311,13 @@ fn test_set_label(cl: &Client) {
         assert_eq!(info.labels[0], json::GetAddressInfoResultLabel::Simple("label".into()));
     } else {
         assert_eq!(info.label.as_ref().unwrap(), "label");
-        assert_eq!(info.labels[0], json::GetAddressInfoResultLabel::WithPurpose {
-            name: "label".into(),
-            purpose: json::GetAddressInfoResultLabelPurpose::Receive,
-        });
+        assert_eq!(
+            info.labels[0],
+            json::GetAddressInfoResultLabel::WithPurpose {
+                name: "label".into(),
+                purpose: json::GetAddressInfoResultLabelPurpose::Receive,
+            }
+        );
     }
 
     cl.set_label(&addr, "other").unwrap();
@@ -324,10 +327,13 @@ fn test_set_label(cl: &Client) {
         assert_eq!(info.labels[0], json::GetAddressInfoResultLabel::Simple("other".into()));
     } else {
         assert_eq!(info.label.as_ref().unwrap(), "other");
-        assert_eq!(info.labels[0], json::GetAddressInfoResultLabel::WithPurpose {
-            name: "other".into(),
-            purpose: json::GetAddressInfoResultLabelPurpose::Receive,
-        });
+        assert_eq!(
+            info.labels[0],
+            json::GetAddressInfoResultLabel::WithPurpose {
+                name: "other".into(),
+                purpose: json::GetAddressInfoResultLabelPurpose::Receive,
+            }
+        );
     }
 }
 

json/src/lib.rs

@@ -653,7 +653,7 @@ pub enum GetAddressInfoResultLabel {
     WithPurpose {
         name: String,
         purpose: GetAddressInfoResultLabelPurpose,
-    }
+    },
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]