Skip to content
Permalink
Browse files

Move cache outside of build-dYYMMDD directory so it can be cached

Travis allows us to cache directories between builds. Let make it
easier.
  • Loading branch information
hrw committed Jan 22, 2020
1 parent 3fa11cb commit e381395b2d16d2715552fc030fc059892c1d609e
Showing with 7 additions and 1 deletion.
  1. +4 −0 .travis.yml
  2. +1 −1 Makefile
  3. +2 −0 bin/build-release
@@ -1,6 +1,10 @@
dist: bionic

language: bash # same as minimal
cache:
directories:
- $HOME/build/$TRAVIS_REPO_SLUG/../ccache
- $HOME/build/$TRAVIS_REPO_SLUG/../download

install:
- bin/system-setup
@@ -14,7 +14,7 @@ DISK_IMG = $(OUT_D)/disk.img
PART_IMG = $(OUT_D)/part.img
TAR_IMG = $(OUT_D)/rootfs.tar
BR_TAR_IMG = $(BR_OUT_D)/images/rootfs.tar
BR2_CCACHE_DIR = $(OUT_D)/ccache
BR2_CCACHE_DIR = $(TOP_D)/ccache/$(ARCH)

BR_MAKE = cd $(BR_D) && mkdir -p "$(TMPDIR)" && \
make O=$(BR_OUT_D) BR2_DL_DIR=$(DL_D) \
@@ -188,6 +188,8 @@ logevent "end kernel and grub downloads" "$kstart"
# STAGE 2: BUILD
jobs_flag=""
parallel=true
mkdir -p ../ccache
ln -snf ../ccache ccache
case "${CIRROS_PARALLEL:-none}" in
none) parallel=false;;
0|true) :;;

0 comments on commit e381395

Please sign in to comment.
You can’t perform that action at this time.