ci(windows): ninja from github

norihiro · May 28, 2021 · 88fa4ec · 88fa4ec
1 parent 3397d28
commit 88fa4ec
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ci/windows/setup-pango.sh b/ci/windows/setup-pango.sh
@@ -11,13 +11,15 @@ curl http://repo.msys2.org/msys/x86_64/libxxhash-0.8.0-1-x86_64.pkg.tar.zst | ta
 curl http://repo.msys2.org/msys/x86_64/wget-1.21.1-2-x86_64.pkg.tar.zst | tar Cvxf / - --zstd
 curl http://repo.msys2.org/msys/x86_64/libpcre2_8-10.36-1-x86_64.pkg.tar.zst | tar Cvxf / - --zstd
 curl http://repo.msys2.org/msys/x86_64/libmetalink-0.1.3-3-x86_64.pkg.tar.zst | tar Cvxf / - --zstd
-curl http://repo.msys2.org/msys/x86_64/ninja-1.10.2-1-x86_64.pkg.tar.zst | tar Cvxf / - --zstd
 curl http://repo.msys2.org/msys/x86_64/libgpgme-1.15.1-2-x86_64.pkg.tar.zst | tar Cvxf / - --zstd
+mkdir ninja
+curl -LO https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip && unzip ninja-win.zip -d ninja
+PATH="$PWD/ninja:$PATH"
 
 # -G 'Ninja'
 # -G "Visual Studio 16 2019"
 sed -i \
 	-e "s;-G 'Ninja';-G 'Visual Studio 16 2019';g" \
-	-e 's/ninja install/cmake --config Release --build . && cmake --config Release --install ./g' \
+	-e 's/ninja install$/cmake --config Release --build . ; cmake --config Release --install ./g' \
 	./prepare.sh
 . ./prepare.sh