Merge targets in travis ci and fix typo in Makefile

master
Jiajie Chen 6 years ago
parent 11e02349a7
commit c20c79c29e

@ -17,30 +17,13 @@ os:
env: env:
matrix: matrix:
- ARCH="x86_64" SRC="ucore" - ARCH="x86_64" SRC="all"
- ARCH="aarch64" SRC="ucore" - ARCH="aarch64" SRC="all"
- ARCH="riscv32" SRC="ucore" - ARCH="riscv32" SRC="all"
- ARCH="riscv64" SRC="ucore" - ARCH="riscv64" SRC="all"
- ARCH="x86_64" SRC="rust"
- ARCH="aarch64" SRC="rust"
- ARCH="riscv32" SRC="rust"
- ARCH="riscv64" SRC="rust"
- ARCH="x86_64" SRC="biscuit"
- ARCH="aarch64" SRC="biscuit"
- ARCH="riscv64" SRC="biscuit"
- ARCH="x86_64" SRC="nginx"
- ARCH="aarch64" SRC="nginx"
- ARCH="riscv64" SRC="nginx"
- ARCH="x86_64" SRC="redis"
- ARCH="aarch64" SRC="redis"
- ARCH="riscv32" SRC="redis"
allow_failures: allow_failures:
matrix: matrix:
- env: ARCH="x86_64" SRC="redis" # unable to reproduce locally, weird..
- env: ARCH="aarch64" SRC="redis" # unable to reproduce locally, weird..
- env: ARCH="riscv32" SRC="redis" # unable to reproduce locally, weird..
# too slow or homebrew too old # too slow or homebrew too old
- os: osx - os: osx

@ -80,7 +80,7 @@ endif
endif endif
redis: redis:
ifneq ($(redis), on) ifeq ($(redis), on)
ifneq ($(arch), riscv64) ifneq ($(arch), riscv64)
ifneq ($(shell uname), Darwin) ifneq ($(shell uname), Darwin)
mkdir -p $(out_dir) mkdir -p $(out_dir)

Loading…
Cancel
Save