Skip to content

Commit

Permalink
ci: build with Cargo before building with Ninja
Browse files Browse the repository at this point in the history
  • Loading branch information
piscisaureus committed Dec 19, 2018
1 parent 550ee21 commit ebcfd73
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
9 changes: 6 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit ebcfd73

Please sign in to comment.