fixup

Author: gnzlbg

azure-pipelines.yml

@@ -7,14 +7,11 @@ jobs:
       vmImage: ubuntu-16.04
     steps:
       - template: ci/azure-install-rust.yml
-      - bash: rustup target add $TARGET
-        displayName: "add cross target"
-      - bash: cargo generate-lockfile
-        displayName: "generate lockfile libc"
-      - bash: cargo generate-lockfile --manifest-path libc-test/Cargo.toml
-        displayName: "generate lockfile libc-test"
-      - script: sh ./ci/run-docker.sh $TARGET
-        displayName: "run tests"
+      - bash: |
+          rustup target add $TARGET
+          cargo generate-lockfile
+          cargo generate-lockfile --manifest-path libc-test/Cargo.toml
+          sh ./ci/run-docker.sh $TARGET
     strategy:
       matrix:
         aarch64-unknown-linux-android:
@@ -75,76 +72,46 @@ jobs:
       vmImage: macos-10.14
     steps:
       - template: ci/azure-install-rust.yml
-      - bash: rustup target add $TARGET
-        displayName: "add cross target"
-      - bash: cargo generate-lockfile
-        displayName: "generate lockfile libc"
-      - bash: cargo generate-lockfile --manifest-path libc-test/Cargo.toml
-        displayName: "generate lockgile libc-test"
-      - script: sh ./ci/run.sh $TARGET
-        displayName: "run tests"
+      - bash: |
+          rustup target add $TARGET
+          cargo generate-lockfile
+          cargo generate-lockfile --manifest-path libc-test/Cargo.toml
+          sh ./ci/run.sh $TARGET
     strategy:
       matrix:
         i686-apple-darwin:
           TARGET: i686-apple-darwin
         x86_64-apple-darwin:
           TARGET: x86_64-apple-darwin
 
-  - job: Documentation
+  - job: Style & Documentation
     pool:
       vmImage: ubuntu-16.04
     steps:
       - template: ci/azure-install-rust.yml
-      - script: rustup component add rust-src
-        displayName: "add rust-src component"
-      - script: cargo install xargo
-        displayName: "add xargo"
+      - script: sh ci/style.sh
       - script: sh ci/dox.sh
 
-  - job: Style
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-      - template: ci/azure-install-rust.yml
-      - bash: rustup target add x86_64-unknown-linux-gnu
-        displayName: "add cross target"
-      - script: rustc ci/style.rs && ./style src
-      - script: |
-          if rustup component add rustfmt-preview ; then
-              cargo fmt --all -- --check
-          fi
-
   - job: SemverLinux
     continueOnError: true
     pool:
       vmImage: ubuntu-16.04
     steps:
       - template: ci/azure-install-rust.yml
-      - bash: rustup target add x86_64-unknown-linux-gnu
-        displayName: "add cross target"
-      - bash: cargo +nightly install semverver
-        displayName: "add rust-semverver"
-      - script: sh ci/semver.sh
-        displayName: "run semver test"
+      - script: sh ci/semver.sh linux
 
   - job: SemverOSX
     continueOnError: true
     pool:
       vmImage: macos-10.14
     steps:
       - template: ci/azure-install-rust.yml
-      - bash: cargo +nightly install semverver
-        displayName: "add rust-semverver"
-      - script: sh ci/semver.sh
-        displayName: "run semver test"
+      - script: sh ci/semver.sh osx
 
   - job: Shellcheck
     pool:
       vmImage: ubuntu-16.04
     steps:
-      - script: shellcheck --version
-      # FIXME: https://github.com/koalaman/shellcheck/issues/1591
-      - script: shellcheck -e SC2103 ci/*.sh
 
   - job: BuildChannelsLinux
     pool:
@@ -200,30 +167,3 @@ jobs:
           TOOLCHAIN: 1.30.0
     variables:
       OS: osx
-
-  - job: NintendoSwitch
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-      - template: ci/azure-install-rust.yml
-      - bash: rustup target add x86_64-unknown-linux-gnu
-        displayName: "add cross target"
-      - bash: rustup component add rust-src
-        displayName: Add rust-src component
-      - bash: cargo install cargo-xbuild
-        displayName: Install cargo-xbuild
-      - bash: |
-          set -ex
-          mkdir -p target
-          (
-              cd target
-              wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb
-              sudo dpkg -i devkitpro-pacman.deb
-              sudo dkp-pacman -Sy
-              sudo dkp-pacman -Syu
-              sudo dkp-pacman -S -v --noconfirm switch-dev devkitA64
-          )
-          cp ci/switch.json switch.json
-          PATH="$PATH:/opt/devkitpro/devkitA64/bin"
-          PATH="$PATH:/opt/devkitpro/tools/bin"
-          cargo xbuild --target switch.json

ci/build.sh

@@ -12,8 +12,12 @@ RUST=${TOOLCHAIN}
 
 echo "Testing Rust ${RUST} on ${OS}"
 
+if [ "${TOOLCHAIN}" = "nightly" ] ; then
+    cargo +nightly install cargo-xbuild -Z install-upgrade
+fi
+
 test_target() {
-    CARGO="${1}"
+    BUILD_CMD="${1}"
     TARGET="${2}"
     NO_STD="${3}"
 
@@ -48,21 +52,21 @@ test_target() {
     fi
 
     # Test that libc builds without any default features (no libstd)
-    "$CARGO" "+${RUST}" build -vv $opt --no-default-features --target "${TARGET}"
+    cargo "+${RUST}" "${BUILD_CMD}" -vv $opt --no-default-features --target "${TARGET}"
 
     # Test that libc builds with default features (e.g. libstd)
     # if the target supports libstd
     if [ "$NO_STD" != "1" ]; then
-        "$CARGO" "+${RUST}" build -vv $opt --target "${TARGET}"
+        cargo "+${RUST}" "${BUILD_CMD}" -vv $opt --target "${TARGET}"
     fi
 
     # Test that libc builds with the `extra_traits` feature
-    "$CARGO" "+${RUST}" build -vv $opt --no-default-features --target "${TARGET}" \
+    cargo "+${RUST}" "${BUILD_CMD}" -vv $opt --no-default-features --target "${TARGET}" \
           --features extra_traits
 
     # Also test that it builds with `extra_traits` and default features:
     if [ "$NO_STD" != "1" ]; then
-        "$CARGO" "+${RUST}" build -vv $opt --target "${TARGET}" \
+        cargo "+${RUST}" "${BUILD_CMD}" -vv $opt --target "${TARGET}" \
               --features extra_traits
     fi
 }
@@ -169,7 +173,7 @@ case "${OS}" in
 esac
 
 for TARGET in $TARGETS; do
-    test_target cargo "$TARGET"
+    test_target build "$TARGET"
 done
 
 # FIXME: https://github.com/rust-lang/rust/issues/58564
@@ -218,6 +222,23 @@ x86_64-unknown-openbsd \
 
 if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then
     for TARGET in $RUST_LINUX_NO_CORE_TARGETS; do
-        test_target xargo "$TARGET" 1
+        test_target xbuild "$TARGET" 1
     done
+
+    # Nintendo switch
+    cargo clean
+    mkdir -p target
+    (
+        cd target
+        wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb
+        sudo dpkg -i devkitpro-pacman.deb
+        sudo dkp-pacman -Sy
+        sudo dkp-pacman -Syu
+        sudo dkp-pacman -S -v --noconfirm switch-dev devkitA64
+    )
+    cp ci/switch.json switch.json
+    PATH="$PATH:/opt/devkitpro/devkitA64/bin"
+    PATH="$PATH:/opt/devkitpro/tools/bin"
+    cargo xbuild --target switch.json
 fi
+

ci/dox.sh

@@ -13,6 +13,14 @@ PLATFORM_SUPPORT=platform-support.md
 rm -rf $TARGET_DOC_DIR
 mkdir -p $TARGET_DOC_DIR
 
+if ! rustc --version | grep -E "nightly" ; then
+    echo "Building the documentation requires a nightly Rust toolchain"
+    exit 1
+fi
+
+rustup component add rust-src
+cargo +nightly install xargo -Z install-upgrade
+
 # List all targets that do currently build successfully:
 # shellcheck disable=SC1003
 grep '[\d|\w|-]* \\' ci/build.sh > targets

ci/semver.sh

@@ -4,10 +4,17 @@
 
 set -ex
 
-OS=${TRAVIS_OS_NAME}
+OS=${1}
 
 echo "Testing Semver on ${OS}"
 
+if ! rustc --version | grep -E "nightly" ; then
+    echo "Building the documentation requires a nightly Rust toolchain"
+    exit 1
+fi
+
+cargo +nightly install semverver -Z install-upgrade
+
 TARGETS=
 case "${OS}" in
     *linux*)

ci/style.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+
+set -ex
+
+rustc ci/style.rs && ./style src
+
+if rustup component add rustfmt-preview ; then
+    cargo fmt --all -- --check
+fi
+
+if shellcheck --version ; then
+    shellcheck -e SC2103 ci/*.sh
+else
+    echo "shellcheck not found"
+    exit 1
+fi
+