about summary refs log tree commit diff
path: root/src/ci/scripts
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-10-08 16:10:25 +0200
committerPietro Albini <pietro@pietroalbini.org>2019-10-25 16:08:39 +0200
commit7855ee2aa81971c02864deb4dbc88a2885808262 (patch)
tree0c02a8fb645cbc74283672a1c2a7d13fef17d18a /src/ci/scripts
parent4bc4fae07384b547fc64e60d3e4dd8e6ed35196a (diff)
downloadrust-7855ee2aa81971c02864deb4dbc88a2885808262.tar.gz
rust-7855ee2aa81971c02864deb4dbc88a2885808262.zip
ci: fix tidy
Diffstat (limited to 'src/ci/scripts')
-rwxr-xr-xsrc/ci/scripts/enable-docker-ipv6.sh3
-rwxr-xr-xsrc/ci/scripts/install-clang.sh3
-rwxr-xr-xsrc/ci/scripts/install-innosetup.sh3
-rwxr-xr-xsrc/ci/scripts/install-mingw.sh3
-rwxr-xr-xsrc/ci/scripts/install-ninja.sh3
5 files changed, 10 insertions, 5 deletions
diff --git a/src/ci/scripts/enable-docker-ipv6.sh b/src/ci/scripts/enable-docker-ipv6.sh
index 35bb0ad7d29..03d5a75e24e 100755
--- a/src/ci/scripts/enable-docker-ipv6.sh
+++ b/src/ci/scripts/enable-docker-ipv6.sh
@@ -9,6 +9,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
 if isLinux; then
     sudo mkdir -p /etc/docker
-    echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json
+    echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' \
+        | sudo tee /etc/docker/daemon.json
     sudo service docker restart
 fi
diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh
index 79cbc73a61a..13740e7ba5a 100755
--- a/src/ci/scripts/install-clang.sh
+++ b/src/ci/scripts/install-clang.sh
@@ -38,5 +38,6 @@ elif isWindows; then
     mkdir -p citools
     cd citools
     curl -f "${MIRRORS_BASE}/LLVM-7.0.0-win64.tar.gz" | tar xzf -
-    ciCommandSetEnv RUST_CONFIGURE_ARGS "${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"
+    ciCommandSetEnv RUST_CONFIGURE_ARGS \
+        "${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"
 fi
diff --git a/src/ci/scripts/install-innosetup.sh b/src/ci/scripts/install-innosetup.sh
index c410bb9b4ff..4ad5f242402 100755
--- a/src/ci/scripts/install-innosetup.sh
+++ b/src/ci/scripts/install-innosetup.sh
@@ -11,7 +11,8 @@ IFS=$'\n\t'
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
 if isWindows; then
-    curl.exe -o is-install.exe https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2017-08-22-is.exe
+    curl.exe -o is-install.exe \
+        https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2017-08-22-is.exe
     is-install.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
 
     ciCommandAddPath "C:\\Program Files (x86)\\Inno Setup 5"
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh
index cf3e3e7ec25..5a1c19b8981 100755
--- a/src/ci/scripts/install-mingw.sh
+++ b/src/ci/scripts/install-mingw.sh
@@ -38,7 +38,8 @@ if isWindows; then
         if [ "$MSYS_BITS" = "64" ]; then
           arch=x86_64
         fi
-        pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake mingw-w64-$arch-gcc mingw-w64-$arch-python2
+        pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
+            mingw-w64-$arch-gcc mingw-w64-$arch-python2
         ciCommandAddPath "${SYSTEM_WORKFOLDER}/msys2/mingw${MSYS_BITS}/bin"
     fi
 fi
diff --git a/src/ci/scripts/install-ninja.sh b/src/ci/scripts/install-ninja.sh
index c3d0217706a..f5ab17edb71 100755
--- a/src/ci/scripts/install-ninja.sh
+++ b/src/ci/scripts/install-ninja.sh
@@ -8,7 +8,8 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
 if isWindows; then
     mkdir ninja
-    curl -o ninja.zip https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2017-03-15-ninja-win.zip
+    curl -o ninja.zip \
+        https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2017-03-15-ninja-win.zip
     7z x -oninja ninja.zip
     rm ninja.zip
     ciCommandSetEnv "RUST_CONFIGURE_ARGS" "${RUST_CONFIGURE_ARGS} --enable-ninja"