File tree Expand file tree Collapse file tree 3 files changed +21
-14
lines changed Expand file tree Collapse file tree 3 files changed +21
-14
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -105,7 +105,11 @@ steps:
105105 displayName : Install MinGW
106106 condition : and(succeeded(), not(variables.SKIP_JOB))
107107
108- - template : install-windows-build-deps.yml
108+ - bash : src/ci/scripts/install-ninja.sh
109+ env :
110+ AGENT_OS : $(Agent.OS)
111+ displayName : Install ninja
112+ condition : and(succeeded(), not(variables.SKIP_JOB))
109113
110114# Looks like docker containers have IPv6 disabled by default, so let's turn it
111115# on since libstd tests require it
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+ # Note that this is originally from the github releases patch of Ninja
3+
4+ set -euo pipefail
5+ IFS=$' \n\t '
6+
7+ source " $( cd " $( dirname " $0 " ) " && pwd) /../shared.sh"
8+
9+ if isWindows; then
10+ mkdir ninja
11+ curl -o ninja.zip https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2017-03-15-ninja-win.zip
12+ 7z x -oninja ninja.zip
13+ rm ninja.zip
14+ ciCommandSetEnv " RUST_CONFIGURE_ARGS" " ${RUST_CONFIGURE_ARGS} --enable-ninja"
15+ ciCommandAddPath " $( pwd) /ninja"
16+ fi
You can’t perform that action at this time.
0 commit comments