Move cache outside of build-dYYMMDD directory so it can be cached
Travis allows us to cache directories between builds. Let make it easier.
This commit is contained in:
parent
3fa11cb1e7
commit
e381395b2d
|
@ -1,6 +1,10 @@
|
||||||
dist: bionic
|
dist: bionic
|
||||||
|
|
||||||
language: bash # same as minimal
|
language: bash # same as minimal
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- $HOME/build/$TRAVIS_REPO_SLUG/../ccache
|
||||||
|
- $HOME/build/$TRAVIS_REPO_SLUG/../download
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- bin/system-setup
|
- bin/system-setup
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -14,7 +14,7 @@ DISK_IMG = $(OUT_D)/disk.img
|
||||||
PART_IMG = $(OUT_D)/part.img
|
PART_IMG = $(OUT_D)/part.img
|
||||||
TAR_IMG = $(OUT_D)/rootfs.tar
|
TAR_IMG = $(OUT_D)/rootfs.tar
|
||||||
BR_TAR_IMG = $(BR_OUT_D)/images/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)" && \
|
BR_MAKE = cd $(BR_D) && mkdir -p "$(TMPDIR)" && \
|
||||||
make O=$(BR_OUT_D) BR2_DL_DIR=$(DL_D) \
|
make O=$(BR_OUT_D) BR2_DL_DIR=$(DL_D) \
|
||||||
|
|
|
@ -188,6 +188,8 @@ logevent "end kernel and grub downloads" "$kstart"
|
||||||
# STAGE 2: BUILD
|
# STAGE 2: BUILD
|
||||||
jobs_flag=""
|
jobs_flag=""
|
||||||
parallel=true
|
parallel=true
|
||||||
|
mkdir -p ../ccache
|
||||||
|
ln -snf ../ccache ccache
|
||||||
case "${CIRROS_PARALLEL:-none}" in
|
case "${CIRROS_PARALLEL:-none}" in
|
||||||
none) parallel=false;;
|
none) parallel=false;;
|
||||||
0|true) :;;
|
0|true) :;;
|
||||||
|
|
Loading…
Reference in New Issue