Skip to content
This repository has been archived by the owner on Jun 17, 2020. It is now read-only.

Commit

Permalink
Handle incremental build with full cached deno build in build-cache
Browse files Browse the repository at this point in the history
  • Loading branch information
maxmcd committed Jul 17, 2018
1 parent d2864fa commit 5f4f797
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 24 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ script:
- set -e
- echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
- docker-compose build deno
- ls -lah $HOME/third_party
- VOLUMES="-v $HOME/third_party:/opt/deno/src/third_party/ -v $HOME/build-path:/opt/deno/src/out/Default -v $HOME/ccache_dir:/root/.ccache/" ./build-with-volumes.sh
env:
global:
- secure: D9u/uHAJF1d25aD7clBEVDVgvtPH7MyETa4/YbWI9vm0d0Oh64aLPB97BRsdTf0SyuAZBMNhu0tI9E7tialElhKUmgcmFwFMCNLFtwLS9bC1AioiVCnkAL18ZYxjEu6nHkQyZrimyMSby23rquSZduCPEL9Tdl7x8hwahYwJt9ziCDhiqOLgqHDgcjfXaGsDpqWsGzFoQ6hZ47FPBG8a8DV8dpvyqcw1c5/AxuXN1ED+FVq8b8rCFATyFVU4L0PbhY3qWWV2hjKa1N8200Pb6zX+xepdjmiRsuvaGjAn1TblHTN5eIW1MCURdP7pIsvnIM064Okll9DmuGZIA265XDq0Apb7OPm8/lEJIdL2jWpQ8rEexjcuCgOr61PwqQEoLLTbGn+gPNj38WFMDNMDQ8OYtEzcykTRly5rIx6Af4OskLQbv8wmLFJyqeovhroxvZFmRPMpTTTBvw4HOhL4Ow3IiyLTG/+3OGrCSpgI5JxXmrudEEaP6eEx8krnvaw+IM11LX4JXjKuYk3Vum5msAHDdvOjO0CASs4XLAoJ9lRIIXTcda0rsDo0J6Rjeakjf6JzAFPo2tM9EDd+1LRaJD/tQIb8Fb31yWnG0gnsr6fGaUpvYyrNyQ0hHVnq49wlLoLwyUNy+UJpOOXy6+iVOepTST0BpTkHpV3NCWIB2Es=
Expand Down
15 changes: 5 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
FROM maxmcd/deno:_build-cache

WORKDIR /opt/
RUN git clone https://github.com/ry/deno.git
WORKDIR /opt/deno/src
RUN cd js; yarn install
# RUN gclient sync --no-history
# RUN gn gen out/Default --args='is_debug=false use_allocator="none" cc_wrapper="ccache" use_custom_libcxx=false use_sysroot=false'
# RUN ninja -C out/Default/ mock_runtime_test deno
# RUN ninja -C out/Default/ deno_rs

# CMD /opt/deno/src/out/Default/deno
RUN git pull origin master
RUN ./tools/build_third_party.py
RUN gn gen out/Default/ --args='is_debug=false use_allocator="none" cc_wrapper="ccache" use_custom_libcxx=false use_sysroot=false'
RUN ccache -s
RUN ninja -C out/Default/ :all

8 changes: 8 additions & 0 deletions build-cache.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,11 @@ ENV PATH=/root/.cargo/bin:$PATH

RUN cd /opt/ && git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
ENV PATH=$PATH:/opt/depot_tools

RUN cd /opt/ && git clone https://github.com/ry/deno.git
WORKDIR /opt/deno
RUN ./tools/build_third_party.py
RUN gn gen out/Default/ --args='is_debug=false use_allocator="none" cc_wrapper="ccache" use_custom_libcxx=false use_sysroot=false'
RUN ccache -s
RUN ninja -C out/Default/ :all

7 changes: 0 additions & 7 deletions build-with-volumes.sh

This file was deleted.

5 changes: 0 additions & 5 deletions run-and-commit.sh

This file was deleted.

0 comments on commit 5f4f797

Please sign in to comment.