Skip to content

Commit 05284e7

Browse files
committed
Build fixes #18
1 parent e2483a3 commit 05284e7

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.circleci/config.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ commands:
1515
- run:
1616
name: Install dependencies
1717
command: |
18-
./automation/readies/bin/getpy
19-
./automation/system-setup.py
18+
sudo ./automation/readies/bin/getpy
19+
sudo ./automation/system-setup.py
2020
git clone git://github.com/antirez/redis.git --branch 5.0.5
21-
(cd redis && make malloc=libc -j $(nproc) && make install)
21+
(cd redis && make malloc=libc -j $(nproc) && sudo make install)
2222
./get_deps.sh cpu
2323
- save_cache:
2424
paths:
@@ -31,7 +31,8 @@ commands:
3131
name: Test
3232
command: |
3333
mkdir -p /workspace/tests
34-
make -C automation test TEST_REPORT_DIR=/workspace/tests SHOW=1
34+
make -C automation test SHOW=1
35+
cp test/logs/* /workspace/tests
3536
- run:
3637
name: Package
3738
command: make -C automation pack BRANCH="${CIRCLE_BRANCH//[^A-Za-z0-9._-]/_}" INTO=/workspace/packages SHOW=1
@@ -58,7 +59,7 @@ commands:
5859
jobs:
5960
build:
6061
docker:
61-
- image: 'redislabsmodules/rmbuilder:latest'
62+
- image: circleci/python:3.7.4-buster
6263
environment:
6364
DEPS: ""
6465
steps:

automation/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ pack_deps: pack_ramp
103103
TEST_REPORT_DIR ?= $(PWD)
104104

105105
test:
106-
$(SHOW)if [ "$(git lfs env > /dev/null 2>&1 ; echo $?)" != "0" ]; then git lfs install; fi
107-
$(SHOW)git lfs pull
106+
$(SHOW)if [ "$(git lfs env > /dev/null 2>&1 ; echo $?)" != "0" ]; then cd $(ROOT); git lfs install; fi
107+
$(SHOW)cd $(ROOT); git lfs pull
108108
$(SHOW)set -e ;\
109109
cd $(ROOT)/test ;\
110110
python3 -m RLTest $(TEST_ARGS) --test basic_tests.py \

0 commit comments

Comments
 (0)