Skip to content

Commit fa56eb2

Browse files
committed
ci: extract installing ninja into a script
1 parent 4958d0b commit fa56eb2

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

src/ci/azure-pipelines/steps/install-windows-build-deps.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/ci/azure-pipelines/steps/run.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff 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

src/ci/scripts/install-ninja.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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

0 commit comments

Comments
 (0)