Enable more tasks

Author: asomers

.cirrus.yml

@@ -7,7 +7,7 @@ env:
   BUILD: build
   RUSTFLAGS: -D warnings
   RUSTDOCFLAGS: -D warnings
-  PLUSTOOLCHAIN: +$TOOLCHAIN
+  PLUS: +
   TOOL: cargo
   # The MSRV
   TOOLCHAIN: 1.63.0
@@ -17,21 +17,21 @@ env:
 build: &BUILD
   build_script:
     - . $HOME/.cargo/env || true
-    - $TOOL $PLUSTOOLCHAIN -Vv
-    - rustc $PLUSTOOLCHAIN -Vv
-    - $TOOL $PLUSTOOLCHAIN $BUILD $ZFLAGS --target $TARGET --all-targets
-    - $TOOL $PLUSTOOLCHAIN doc $ZFLAGS --no-deps --target $TARGET
-    - $TOOL $PLUSTOOLCHAIN clippy $ZFLAGS --target $TARGET --all-targets -- -D warnings
+    - $TOOL $PLUS $TOOLCHAIN -Vv
+    - rustc $PLUS $TOOLCHAIN -Vv
+    - $TOOL $PLUS $TOOLCHAIN $BUILD $ZFLAGS --target $TARGET --all-targets
+    - $TOOL $PLUS $TOOLCHAIN doc $ZFLAGS --no-deps --target $TARGET
+    - $TOOL $PLUS $TOOLCHAIN clippy $ZFLAGS --target $TARGET --all-targets -- -D warnings
     - if [ -z "$NOHACK" ]; then mkdir -p $HOME/.cargo/bin; export PATH=$HOME/.cargo/bin:$PATH; fi
     - if [ -z "$NOHACK" ]; then curl -LsSf https://github.com/taiki-e/cargo-hack/releases/latest/download/cargo-hack-${HOST:-$TARGET}.tar.gz | tar xzf - -C ~/.cargo/bin; fi
-    - if [ -z "$NOHACK" ]; then $TOOL $PLUSTOOLCHAIN hack $ZFLAGS check --target $TARGET --each-feature; fi
+    - if [ -z "$NOHACK" ]; then $TOOL $PLUS $TOOLCHAIN hack $ZFLAGS check --target $TARGET --each-feature; fi
 
 # Tests that do require executing the binaries
 test: &TEST
   << : *BUILD
   test_script:
     - . $HOME/.cargo/env || true
-    - $TOOL $PLUSTOOLCHAIN test --target $TARGET
+    - $TOOL $PLUS $TOOLCHAIN test --target $TARGET
 
 # Test FreeBSD in a full VM.  Test the i686 target too, in the
 # same VM.  The binary will be built in 32-bit mode, but will execute on a
@@ -83,20 +83,20 @@ test: &TEST
   #<< : *TEST
   #before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-## Use cross for QEMU-based testing
-## cross needs to execute Docker, so we must use Cirrus's Docker Builder task.
-#task:
-  #env:
-    #RUST_TEST_THREADS: 1            # QEMU works best with 1 thread
-    #HOME: /tmp/home
-    #HOST: x86_64-unknown-linux-gnu
-    #PATH: $HOME/.cargo/bin:$PATH
-    #RUSTFLAGS: --cfg qemu -D warnings
-    #TOOL: cross
-  #matrix:
-    #- name: Linux arm gnueabi
-      #env:
-        #TARGET: arm-unknown-linux-gnueabi
+# Use cross for QEMU-based testing
+# cross needs to execute Docker, so we must use Cirrus's Docker Builder task.
+task:
+  env:
+    RUST_TEST_THREADS: 1            # QEMU works best with 1 thread
+    HOME: /tmp/home
+    HOST: x86_64-unknown-linux-gnu
+    PATH: $HOME/.cargo/bin:$PATH
+    RUSTFLAGS: --cfg qemu -D warnings
+    TOOL: cross
+  matrix:
+    - name: Linux arm gnueabi
+      env:
+        TARGET: arm-unknown-linux-gnueabi
     #- name: Linux armv7 gnueabihf
       #env:
         #TARGET: armv7-unknown-linux-gnueabihf
@@ -121,44 +121,44 @@ test: &TEST
     #- name: Linux powerpc64le
       #env:
         #TARGET: powerpc64le-unknown-linux-gnu
-  #compute_engine_instance:
-    #image_project: cirrus-images
-    #image: family/docker-builder
-    #platform: linux
-    #cpu: 1                          # Since QEMU will only use 1 thread
-    #memory: 4G
-  #setup_script:
-    #- mkdir /tmp/home
-    #- curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
-    #- sh rustup.sh -y --profile=minimal --default-toolchain $TOOLCHAIN
-    #- . $HOME/.cargo/env
-    #- cargo install cross --version 0.2.1 # cross 0.2.2 bumped the MSRV to 1.58.1
-  #<< : *TEST
-  #before_cache_script: rm -rf $CARGO_HOME/registry/index
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-builder
+    platform: linux
+    cpu: 1                          # Since QEMU will only use 1 thread
+    memory: 4G
+  setup_script:
+    - mkdir /tmp/home
+    - curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
+    - sh rustup.sh -y --profile=minimal --default-toolchain $TOOLCHAIN
+    - . $HOME/.cargo/env
+    - cargo install cross --version 0.2.1 # cross 0.2.2 bumped the MSRV to 1.58.1
+  << : *TEST
+  before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-## Tasks for Linux native builds
-#task:
-  #matrix:
+# Tasks for Linux native builds
+task:
+  matrix:
     #- name: Linux aarch64
       #arm_container:
         #image: rust:1.63.0
       #env:
         #TARGET: aarch64-unknown-linux-gnu
-    #- name: Linux x86_64
-      #container:
-        #image: rust:1.63.0
-      #env:
-        #TARGET: x86_64-unknown-linux-gnu
+    - name: Linux x86_64
+      container:
+        image: rust:1.63.0
+      env:
+        TARGET: x86_64-unknown-linux-gnu
     #- name: Linux x86_64 musl
       #container:
         #image: rust:1.63.0
       #env:
         #TARGET: x86_64-unknown-linux-musl
-  #setup_script:
-    #- rustup target add $TARGET
-    #- rustup component add clippy
-  #<< : *TEST
-  #before_cache_script: rm -rf $CARGO_HOME/registry/index
+  setup_script:
+    - rustup target add $TARGET
+    - rustup component add clippy
+  << : *TEST
+  before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 task:
   name: Rust Stable
@@ -167,7 +167,7 @@ task:
   env:
     TARGET: x86_64-unknown-linux-gnu
     TOOLCHAIN:
-    PLUSTOOLCHAIN:
+    PLUS:
   setup_script:
     - rustup component add clippy
     - rustup toolchain list
@@ -176,13 +176,13 @@ task:
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 # Tasks for cross-compiling, but no testing
-#task:
-  #container:
-    #image: rust:1.63.0
-  #env:
-    #BUILD: check
-    #HOST: x86_64-unknown-linux-gnu
-  #matrix:
+task:
+  container:
+    image: rust:1.63.0
+  env:
+    BUILD: check
+    HOST: x86_64-unknown-linux-gnu
+  matrix:
     ## Cross claims to support Android, but when it tries to run Nix's tests it
     ## reports undefined symbol references.
     #- name: Android aarch64
@@ -240,15 +240,15 @@ task:
     #- name: macOS x86_64
       #env:
         #TARGET: x86_64-apple-darwin
-    #- name: NetBSD x86_64
-      #env:
-        #TARGET: x86_64-unknown-netbsd
-  #setup_script:
-    #- rustup target add $TARGET
-    #- rustup toolchain install $TOOLCHAIN --profile minimal --target $TARGET
-    #- rustup component add --toolchain $TOOLCHAIN clippy
-  #<< : *BUILD
-  #before_cache_script: rm -rf $CARGO_HOME/registry/index
+    - name: NetBSD x86_64
+      env:
+        TARGET: x86_64-unknown-netbsd
+  setup_script:
+    - rustup target add $TARGET
+    - rustup toolchain install $TOOLCHAIN --profile minimal --target $TARGET
+    - rustup component add --toolchain $TOOLCHAIN clippy
+  << : *BUILD
+  before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 #task:
   #container:
@@ -269,31 +269,32 @@ task:
   #before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 ## Rust Tier 3 targets can't use Rustup
-#task:
-  #container:
-    #image: rustlang/rust:nightly
-  #env:
-    #BUILD: check
-    #HOST: x86_64-unknown-linux-gnu
-    #TOOLCHAIN: nightly
-    #ZFLAGS: -Zbuild-std
-  #matrix:
-    #- name: DragonFly BSD x86_64
-      #env:
-        #TARGET: x86_64-unknown-dragonfly
-    #- name: OpenBSD x86_64
-      #env:
-        #TARGET: x86_64-unknown-openbsd
-    #- name: Linux armv7 uclibceabihf
-      #env:
-        #TARGET: armv7-unknown-linux-uclibceabihf
-    #- name: Haiku x86_64
-      #env:
-        #TARGET: x86_64-unknown-haiku
-  #setup_script:
-    #- rustup component add rust-src
-  #<< : *BUILD
-  #before_cache_script: rm -rf $CARGO_HOME/registry/index
+task:
+  container:
+    image: rustlang/rust:nightly
+  env:
+    BUILD: check
+    HOST: x86_64-unknown-linux-gnu
+    PLUS:
+    TOOLCHAIN: 
+    ZFLAGS: -Zbuild-std
+  matrix:
+    - name: DragonFly BSD x86_64
+      env:
+        TARGET: x86_64-unknown-dragonfly
+    - name: OpenBSD x86_64
+      env:
+        TARGET: x86_64-unknown-openbsd
+    - name: Linux armv7 uclibceabihf
+      env:
+        TARGET: armv7-unknown-linux-uclibceabihf
+    - name: Haiku x86_64
+      env:
+        TARGET: x86_64-unknown-haiku
+  setup_script:
+    - rustup component add rust-src
+  << : *BUILD
+  before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 # Test that we can build with the lowest version of all dependencies.
 # "cargo test" doesn't work because some of our dev-dependencies, like
@@ -302,7 +303,6 @@ task:
   name: Minver
   env:
     HOST: x86_64-unknown-linux-gnu
-    TOOLCHAIN: nightly
   container:
     image: rustlang/rust:nightly
   setup_script:
@@ -311,10 +311,10 @@ task:
     - cargo check
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-## Tasks that checks if the code is formatted right using `cargo fmt` tool
-#task:
-  #name: Rust Formatter
-  #container:
-    #image: rust:latest
-  #setup_script: rustup $PLUSTOOLCHAIN component add rustfmt
-  #test_script: $TOOL $PLUSTOOLCHAIN fmt --all -- --check **/*.rs
+# Tasks that checks if the code is formatted right using `cargo fmt` tool
+task:
+  name: Rust Formatter
+  container:
+    image: rust:latest
+  setup_script: rustup component add rustfmt
+  test_script: cargo fmt --all -- --check **/*.rs