Skip to content

Commit

Permalink
ci: fix tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
pietroalbini committed Oct 8, 2019
1 parent 4a511d9 commit b3a13c0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/ci/scripts/enable-docker-ipv6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion src/ci/scripts/install-clang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion src/ci/scripts/install-innosetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion src/ci/scripts/install-mingw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion src/ci/scripts/install-ninja.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b3a13c0

Please sign in to comment.