Skip to content

Commit 7c3ff5c

Browse files
committed
fixes 8
1 parent 62d76a6 commit 7c3ff5c

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ commands:
3838
command: |
3939
mkdir -p ~/workspace/tests
4040
make -C opt test SHOW=1 VERBOSE=1
41-
cp test/logs/* ~/workspace/tests
4241
- run:
4342
name: Package
4443
command: make -C opt pack BRANCH="${CIRCLE_BRANCH//[^A-Za-z0-9._-]/_}" INTO=~/workspace/packages SHOW=1
@@ -49,8 +48,9 @@ commands:
4948
- 'packages/release/*.tgz'
5049
- 'packages/branch/*.zip'
5150
- 'packages/branch/*.tgz'
52-
- store_test_results:
53-
path: ~/workspace/tests
51+
- store_artifacts:
52+
path: test/logs
53+
5454
deploy:
5555
parameters:
5656
from:
@@ -100,7 +100,7 @@ jobs:
100100
101101
build-macos:
102102
macos:
103-
xcode: 10.2.1
103+
xcode: 11.1.0
104104
steps:
105105
- run:
106106
name: Fix macOS Python installation
@@ -159,7 +159,7 @@ jobs:
159159
mkdir -p ~/workspace/tests
160160
docker run --gpus all -v $HOME/workspace/tests:/build/test/logs -it --rm redisai-gpu:latest-x64-bionic-test
161161
no_output_timeout: 30m
162-
- store_test_results:
162+
- store_artifacts:
163163
path: ~/workspace/tests
164164

165165
deploy_package:

opt/readies/mk/coverage.defs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ COV_EXCLUDE += \
1414
define COVERAGE_RESET
1515
$(SHOW)set -e ;\
1616
echo "Starting coverage analysys." ;\
17-
mkdir -p $(COV_DIR) ;\
18-
lcov --directory $(BINROOT) --base-directory $(SRCDIR) -z > /dev/null 2>&1
17+
mkdir -p $$(COV_DIR) ;\
18+
lcov --directory $$(BINROOT) --base-directory $$(SRCDIR) -z > /dev/null 2>&1
1919
endef
2020

2121
define COVERAGE_COLLECT
2222
$(SHOW)set -e ;\
2323
echo "Collecting coverage data ..." ;\
24-
lcov --capture --directory $(BINROOT) --base-directory $(SRCDIR) --output-file $(COV_INFO) > /dev/null 2>&1 ;\
25-
lcov -o $(COV_INFO) -r $(COV_INFO) $(COV_EXCLUDE) > /dev/null 2>&1
24+
lcov --capture --directory $$(BINROOT) --base-directory $$(SRCDIR) --output-file $$(COV_INFO) > /dev/null 2>&1 ;\
25+
lcov -o $$(COV_INFO) -r $$(COV_INFO) $$(COV_EXCLUDE) > /dev/null 2>&1
2626
endef
2727

2828
define COVERAGE_REPORT
2929
$(SHOW)set -e ;\
30-
lcov -l $(COV_INFO) ;\
31-
genhtml --legend -o $(COV_DIR) $(COV_INFO) > /dev/null 2>&1 ;\
30+
lcov -l $$(COV_INFO) ;\
31+
genhtml --legend -o $$(COV_DIR) $$(COV_INFO) > /dev/null 2>&1 ;\
3232
echo "Coverage info at $$(realpath $$(COV_DIR))/index.html"
3333
endef
3434

0 commit comments

Comments
 (0)