CI: Clean up CI scripts

orion-rs · Oct 6, 2019 · 1eb0b3b · 1eb0b3b
1 parent 4f70021
commit 1eb0b3b
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 202 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,176 +11,65 @@ matrix:
 
   include:
     # -C opt-level = 0
-    - name: "stable + debug + -C opt-level = 0"
-      rust: stable
+    - name: "[DEBUG] stable + nightly && -C opt-level = 0"
       env: 'OPT-LEVEL=0'
       script:
-        - cargo clean
-        - sh run_benches_stable_debug.sh opt-level=0
-        - cargo test -- --nocapture
+        - sh run_benches_debug.sh opt-level=0 x86_64-unknown-linux-gnu
 
-    - name: "stable + release + -C opt-level = 0"
+    - name: "[RELEASE] stable + nightly + -C opt-level = 0"
       rust: stable
       env: 'OPT-LEVEL=0'
       script:
-        - cargo clean
-        - sh run_benches_stable_release.sh opt-level=0
-        - cargo test -- --nocapture
-
-    - name: "nightly + debug + -C opt-level = 0"
-      rust: nightly
-      env: 'OPT-LEVEL=0'
-      script:
-        - cargo clean
-        - sh run_benches_nightly_debug.sh opt-level=0
-        - cargo test -- --nocapture
-
-    - name: "nightly + release + -C opt-level = 0"
-      rust: nightly
-      env: 'OPT-LEVEL=0'
-      script:
-        - cargo clean
-        - sh run_benches_nightly_release.sh opt-level=0
-        - cargo test -- --nocapture
+        - sh run_benches_release.sh opt-level=0 x86_64-unknown-linux-gnu
 
   # -C opt-level = 1
-    - name: "stable + debug + -C opt-level = 1"
-      rust: stable
+    - name: "[DEBUG] stable + nightly && -C opt-level = 1"
       env: 'BUILD=debug'
       script:
-        - cargo clean
-        - sh run_benches_stable_debug.sh opt-level=1
-        - cargo test -- --nocapture
-
-    - name: "stable + release + -C opt-level = 1"
-      rust: stable
-      script:
-        - cargo clean
-        - sh run_benches_stable_release.sh opt-level=1
-        - cargo test -- --nocapture
+        - sh run_benches_debug.sh opt-level=1 x86_64-unknown-linux-gnu
 
-    - name: "nightly + debug + -C opt-level = 1"
-      rust: nightly
-      env: 'BUILD=debug'
+    - name: "[RELEASE] stable + nightly + -C opt-level = 1"
       script:
-        - cargo clean
-        - sh run_benches_nightly_debug.sh opt-level=1
-        - cargo test -- --nocapture
-
-    - name: "nightly + release + -C opt-level = 1"
-      rust: nightly
+        - sh run_benches_release.sh opt-level=1 x86_64-unknown-linux-gnu
+
+    - name: "[RELEASE] stable + nightly && -C opt-level = 1"
+      os: osx
       script:
-        - cargo clean
-        - sh run_benches_nightly_release.sh opt-level=1
-        - cargo test -- --nocapture
+        - sh run_benches_release.sh opt-level=1 x86_64-apple-darwin
 
   # -C opt-level = 2
-    - name: "stable + debug + -C opt-level = 2"
-      rust: stable
+    - name: "[DEBUG] stable + nightly && -C opt-level = 2"
       env: 'BUILD=debug'
       script:
-        - cargo clean
-        - sh run_benches_stable_debug.sh opt-level=2
-        - cargo test -- --nocapture
-
-    - name: "stable + release + -C opt-level = 2"
-      rust: stable
-      script:
-        - cargo clean
-        - sh run_benches_stable_release.sh opt-level=2
-        - cargo test -- --nocapture
+        - sh run_benches_debug.sh opt-level=2 x86_64-unknown-linux-gnu
 
-    - name: "nightly + debug + -C opt-level = 2"
-      rust: nightly
-      env: 'BUILD=debug'
+    - name: "[RELEASE] stable + nightly + -C opt-level = 2"
       script:
-        - cargo clean
-        - sh run_benches_nightly_debug.sh opt-level=2
-        - cargo test -- --nocapture
-
-    - name: "nightly + release + -C opt-level = 2"
-      rust: nightly
+        - sh run_benches_release.sh opt-level=2 x86_64-unknown-linux-gnu
+
+    - name: "[RELEASE] stable + nightly && -C opt-level = 2"
+      os: osx
       script:
-        - cargo clean
-        - sh run_benches_nightly_release.sh opt-level=2
-        - cargo test -- --nocapture
+        - sh run_benches_release.sh opt-level=2 x86_64-apple-darwin
 
   # -C opt-level = 3
-    - name: "stable + debug + -C opt-level = 3"
-      rust: stable
+    - name: "[DEBUG] stable + nightly && -C opt-level = 3"
       env: 'BUILD=debug'
       script:
-        - cargo clean
-        - sh run_benches_stable_debug.sh opt-level=3
-        - cargo test -- --nocapture
+        - sh run_benches_debug.sh opt-level=3 x86_64-unknown-linux-gnu
 
-    - name: "stable + release + -C opt-level = 3"
-      rust: stable
-      script:
-        - cargo clean
-        - sh run_benches_stable_release.sh opt-level=3
-        - cargo test -- --nocapture
-
-    - name: "nightly + debug + -C opt-level = 3"
-      rust: nightly
-      env: 'BUILD=debug'
-      script:
-        - cargo clean
-        - sh run_benches_nightly_debug.sh opt-level=3
-        - cargo test -- --nocapture
-
-    - name: "nightly + release + -C opt-level = 3"
-      rust: nightly
+    - name: "[RELEASE] stable + nightly + -C opt-level = 3"
       script:
-        - cargo clean
-        - sh run_benches_nightly_release.sh opt-level=3
-        - cargo test -- --nocapture
-
-    # OSX
-    - name: "OSX: stable + release + -C opt-level = 3"
-      os: osx
-      rust: stable
-      script:
-        - cargo clean
-        - sh run_benches_stable_release.sh opt-level=3
-        - cargo test -- --nocapture
-
-    - name: "OSX: nightly + release + -C opt-level = 3"
-      os: osx
-      rust: nightly
-      script:
-        - cargo clean
-        - sh run_benches_nightly_release.sh opt-level=3
-        - cargo test -- --nocapture
-
-    - name: "OSX: stable + release + -C opt-level = 2"
-      os: osx
-      rust: stable
-      script:
-        - cargo clean
-        - sh run_benches_stable_release.sh opt-level=2
-        - cargo test -- --nocapture
-
-    - name: "OSX: nightly + release + -C opt-level = 2"
-      os: osx
-      rust: nightly
-      script:
-        - cargo clean
-        - sh run_benches_nightly_release.sh opt-level=2
-        - cargo test -- --nocapture
+        - sh run_benches_release.sh opt-level=3 x86_64-unknown-linux-gnu
 
-    - name: "OSX: stable + release + -C opt-level = 1"
+    - name: "[RELEASE] stable + nightly && -C opt-level = 3"
       os: osx
-      rust: stable
       script:
-        - cargo clean
-        - sh run_benches_stable_release.sh opt-level=1
-        - cargo test -- --nocapture
+        - sh run_benches_release.sh opt-level=3 x86_64-apple-darwin
 
-    - name: "OSX: nightly + release + -C opt-level = 1"
-      os: osx
-      rust: nightly
-      script:
-        - cargo clean
-        - sh run_benches_nightly_release.sh opt-level=1
-        - cargo test -- --nocapture
+install:
+  - rustup toolchain install nightly
+  - rustup toolchain install stable-x86_64-unknown-linux-gnu
+  - rustup toolchain install nightly-x86_64-unknown-linux-gnu
+  - rustup toolchain install stable-x86_64-apple-darwin
+  - rustup toolchain install nightly-x86_64-apple-darwin
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,47 +2,22 @@ image: Visual Studio 2017
 
 environment:
   matrix:
-    # MSVC Rust stable
     - TARGET: i686-pc-windows-msvc
-      RUST_VERSION: stable
     - TARGET: x86_64-pc-windows-msvc
-      RUST_VERSION: stable
-    # MSVC Rust nightly
-    - TARGET: i686-pc-windows-msvc
-      RUST_VERSION: nightly
-    - TARGET: x86_64-pc-windows-msvc
-      RUST_VERSION: nightly
 
 install:
   - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-  - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_VERSION%
+  - rustup-init.exe -y --default-host %TARGET% --default-toolchain stable
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
   - rustc -Vv
   - cargo -V
+  - rustup toolchain install nightly
+  - rustup toolchain install stable-%TARGET%
+  - rustup toolchain install nightly-%TARGET%
 
 test_script:
-  - if [%RUST_VERSION%]==[stable] (
-      cargo clean &&
-      sh run_benches_stable_release.sh opt-level=1 &&
-      cargo test -- --nocapture &&
-      cargo clean &&
-      sh run_benches_stable_release.sh opt-level=2 &&
-      cargo test -- --nocapture &&
-      cargo clean &&
-      sh run_benches_stable_release.sh opt-level=3 &&
-      cargo test -- --nocapture
-    )
-  - if [%RUST_VERSION%]==[nightly]  (
-      cargo clean &&
-      sh run_benches_nightly_release.sh opt-level=1 &&
-      cargo test -- --nocapture &&
-      cargo clean &&
-      sh run_benches_nightly_release.sh opt-level=2 &&
-      cargo test -- --nocapture &&
-      cargo clean &&
-      sh run_benches_nightly_release.sh opt-level=3 &&
-      cargo test -- --nocapture
-    )
+  - sh run_benches_debug.sh opt-level=1 %TARGET%
+  - sh run_benches_stable_release.sh opt-level=2 %TARGET%
 
 cache:
   - C:\Users\appveyor\.cargo\registry

diff --git a/run_benches_debug.sh b/run_benches_debug.sh
@@ -0,0 +1,11 @@
+# stable
+cargo clean;
+mkdir bench-results;
+RUSTFLAGS="-C $1" cargo run --bin ct_benches --target $2 > bench-results/ct_benches.txt;
+cargo test -- --nocapture;
+
+# nightly
+cargo clean;
+mkdir bench-results;
+RUSTFLAGS="-C $1" cargo +nightly run --bin ct_benches --target $2 > bench-results/ct_benches.txt;
+cargo test -- --nocapture;
diff --git a/run_benches_nightly_debug.sh b/run_benches_nightly_debug.sh
diff --git a/run_benches_nightly_release.sh b/run_benches_nightly_release.sh
diff --git a/run_benches_release.sh b/run_benches_release.sh
@@ -0,0 +1,11 @@
+# stable
+cargo clean;
+mkdir bench-results;
+RUSTFLAGS="-C $1" cargo run --release --bin ct_benches --target $2 > bench-results/ct_benches.txt;
+cargo test -- --nocapture;
+
+# nightly
+cargo clean;
+mkdir bench-results;
+RUSTFLAGS="-C $1" cargo +nightly run --release --bin ct_benches --target $2 > bench-results/ct_benches.txt;
+cargo test -- --nocapture;
diff --git a/run_benches_stable_debug.sh b/run_benches_stable_debug.sh
diff --git a/run_benches_stable_release.sh b/run_benches_stable_release.sh