From 11e02349a790923ac3710159f731155f8323b94e Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Tue, 26 Mar 2019 16:22:13 +0800 Subject: [PATCH] Do not build redis on CI by default --- Makefile | 2 ++ README.md | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index cdcb487..e2af632 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,7 @@ endif endif redis: +ifneq ($(redis), on) ifneq ($(arch), riscv64) ifneq ($(shell uname), Darwin) mkdir -p $(out_dir) @@ -88,6 +89,7 @@ ifneq ($(shell uname), Darwin) @cp redis/build/$(arch)/redis-cli $(out_dir)/redis-cli endif endif +endif build: rust ucore biscuit $(busybox) nginx redis diff --git a/README.md b/README.md index cea5ef1..f57abd4 100644 --- a/README.md +++ b/README.md @@ -34,14 +34,14 @@ Output to `build/$(arch)` ## Support matrix -| | x86_64 | aarch64 | riscv32 | riscv64 | -| ------- | ------ | ------- | ------- | ------- | -| ucore | n | y | y | y | -| rust | y | y | y | y | -| biscuit | y | y | n | y | -| nginx | y | y | n | y | -| redis | y | y | y | n | -| busybox | y | y | n | y | +| | x86_64 | aarch64 | riscv32 | riscv64 | +| --------------------------- | ------ | ------- | ------- | ------- | +| ucore | n | y | y | y | +| rust | y | y | y | y | +| biscuit | y | y | n | y | +| nginx | y | y | n | y | +| redis (build with redis=on) | y | y | y | n | +| busybox | y | y | n | y |