From 3631e614b2f21bc3bac19d4998a943ab51452b5b Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Wed, 19 Dec 2018 11:27:15 +0100
Subject: ci: build with Cargo before building with Ninja

---
 .appveyor.yml |  9 ++++++---
 .travis.yml   | 10 ++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e6e4c64b5..050715e53 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -341,10 +341,13 @@ before_build:
       Set-FilesNeeded -Auto -Path $outputs -Reason "Build dependency graph"
 
 build_script:
-  - python tools\build.py
-  - ps: Set-FilesNeeded -Auto -Reason "Build finished"
+  # Build with Cargo first. Both builds produce a deno.exe in the same dir. We
+  # want the final one (which gets tested and released) to be built by Ninja.
   - cargo build -vv --release
-  - ps: Set-FilesNeeded -Auto -Reason "Cargo check finished"
+  - ps: Set-FilesNeeded -Auto -Reason "Cargo build finished"
+
+  - python tools\build.py
+  - ps: Set-FilesNeeded -Auto -Reason "Ninja build finished"
 
 test_script:
   - python tools\lint.py
diff --git a/.travis.yml b/.travis.yml
index beb6c98b5..59d7c7d94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,15 +73,17 @@ script:
   ./tools/build.py -C target/debug -j2 test_cc
   ./target/debug/test_cc
 
+- |-
+  # Build deno.exe with Cargo first. Both builds write their output to the same
+  # directory. We want the final one (which gets tested and released) to be
+  # built by Ninja.
+  cargo build --release -vv -j2
+
 - |-
   # Release build and test
   ./tools/build.py -C target/release -j2
   DENO_BUILD_MODE=release ./tools/test.py
 
-- |-
-  # Cargo check
-  cargo build --release -vv -j2
-
 before_deploy:
 - gzip -c target/release/deno > target/release/deno_${TRAVIS_OS_NAME}_x64.gz
 deploy:
-- 
cgit v1.2.3