Skip to content

Commit ece58d3

Browse files
rafierafie
authored
Build and automation updates (RedisJSON#853)
1 parent ce225df commit ece58d3

File tree

7 files changed

+54
-31
lines changed

7 files changed

+54
-31
lines changed

‎.circleci/config.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,17 @@ commands:
7979
shell: /bin/bash -l -eo pipefail
8080
command: |
8181
./sbin/system-setup.py <<parameters.system_setup_params>>
82-
python3 -m pip list
83-
source $HOME/.cargo/env
84-
rustc --version
85-
cargo --version
86-
rustup --version
87-
if command -v gcc &> /dev/null; then gcc --version; fi
88-
if command -v clang &> /dev/null; then clang --version; fi
8982
- run:
9083
name: Install Redis
9184
shell: /bin/bash -l -eo pipefail
9285
command: |
9386
./deps/readies/bin/getredis -v '<<parameters.redis_version>>' --force <<parameters.getredis_params>>
94-
redis-server --version
87+
- run:
88+
name: System report
89+
shell: /bin/bash -l -eo pipefail
90+
command: |
91+
source $HOME/.cargo/env
92+
make info
9593
9694
save-tests-logs:
9795
steps:
@@ -473,6 +471,13 @@ on-any-branch: &on-any-branch
473471
tags:
474472
only: /.*/
475473

474+
always: &always
475+
filters:
476+
branches:
477+
only: /.*/
478+
tags:
479+
only: /.*/
480+
476481
never: &never
477482
filters:
478483
branches:

‎Makefile

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ make pytest # run flow tests using RLTest
3535
VALGRIND|VG=1 # run specified tests with Valgrind
3636
VERBOSE=1 # display more RLTest-related information
3737

38+
make bench # run benchmarks
39+
3840
make pack # build package (RAMP file)
3941
make upload-artifacts # copy snapshot packages to S3
4042
OSNICK=nick # copy snapshots for specific OSNICK
@@ -46,23 +48,19 @@ common options for upload operations:
4648
VERBOSE=1 # show more details
4749
NOP=1 # do not copy, just print commands
4850

49-
make coverage # perform coverage analysis
50-
make show-cov # show coverage analysis results (implies COV=1)
51-
make upload-cov # upload coverage analysis results to codecov.io (implies COV=1)
52-
53-
make docker # build for specific Linux distribution
54-
OSNICK=nick # Linux distribution to build for
55-
REDIS_VER=ver # use Redis version `ver`
56-
TEST=1 # test aftar build
57-
PACK=1 # create packages
58-
ARTIFACTS=1 # copy artifacts from docker image
59-
PUBLISH=1 # publish (i.e. docker push) after build
51+
make coverage # perform coverage analysis
52+
make show-cov # show coverage analysis results (implies COV=1)
53+
make upload-cov # upload coverage analysis results to codecov.io (implies COV=1)
6054

61-
make sanbox # create container for CLang Sanitizer tests
55+
make docker # build for specific Linux distribution
56+
OSNICK=nick # Linux distribution to build for
57+
REDIS_VER=ver # use Redis version `ver`
58+
TEST=1 # test aftar build
59+
PACK=1 # create packages
60+
ARTIFACTS=1 # copy artifacts from docker image
61+
PUBLISH=1 # publish (i.e. docker push) after build
6262

63-
make builddocs
64-
make localdocs
65-
make deploydocs
63+
make sanbox # create container for CLang Sanitizer tests
6664

6765
endef
6866

@@ -269,6 +267,23 @@ SANBOX_ARGS += -v /w:/w
269267
endif
270268

271269
sanbox:
272-
@docker run -it -v $(PWD):/rejson -w /rejson --cap-add=SYS_PTRACE --security-opt seccomp=unconfined $(SANBOX_ARGS) redisfab/clang:13-x64-bullseye bash
270+
@docker run -it -v $(PWD):/rejson -w /rejson --cap-add=SYS_PTRACE --security-opt seccomp=unconfined \
271+
$(SANBOX_ARGS) redisfab/clang:13-x64-bullseye bash
273272

274273
.PHONY: sanbox
274+
275+
#----------------------------------------------------------------------------------------------
276+
277+
info:
278+
$(SHOW)if command -v redis-server &> /dev/null; then redis-server --version; fi
279+
$(SHOW)rustc --version
280+
$(SHOW)cargo --version
281+
$(SHOW)rustup --version
282+
$(SHOW)rustup show
283+
$(SHOW)if command -v gcc &> /dev/null; then gcc --version; fi
284+
$(SHOW)if command -v clang &> /dev/null; then clang --version; fi
285+
$(SHOW)if command -v cmake &> /dev/null; then cmake --version; fi
286+
$(SHOW)python3 --version
287+
$(SHOW)python3 -m pip list -v
288+
289+
.PHONY: info

‎build/docker/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
ROOT=../..
3-
MK.pyver:=3
3+
44
include $(ROOT)/deps/readies/mk/main
55

66
REPO=rejson
@@ -9,9 +9,9 @@ REDIS_VERSION=6.2.7
99

1010
OSNICK.official=bullseye
1111

12-
INT_BRANCHES=2.2 2.0 1.2 1.0
13-
LATEST_BRANCH=2.2
14-
PREVIEW_BRANCH=2.2
12+
INT_BRANCHES=2.4 2.2 2.0 1.2 1.0
13+
LATEST_BRANCH=2.4
14+
PREVIEW_BRANCH=2.4
1515

1616
ART_DIR=$(ROOT)/bin/artifacts
1717

‎deps/readies

Submodule readies updated 1 file

‎sbin/get-redisearch

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ else
5050
[[ $arch == x64 ]] && arch=x86_64
5151

5252
if [[ $dist == ubuntu ]]; then
53-
if [[ $nick == focal ]]; then
53+
if [[ $nick == jammy ]]; then
54+
nick="ubuntu22.04"
55+
elif [[ $nick == focal ]]; then
5456
nick="ubuntu20.04"
5557
elif [[ $nick == bionic ]]; then
5658
nick="ubuntu18.04"

‎sbin/upload-artifacts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ s3_upload() {
117117
done
118118
fi
119119
[[ $VERBOSE == 1 ]] && s3_ls $upload_dir
120-
120+
121121
return 0
122122
}
123123

‎tests/qa/qatests

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ class Test:
121121
except:
122122
pass
123123

124+
ENV['TEST_TITLE'] = self.title
124125
ENV['MODULE_VERSION'] = modver
125126
ENV['MODULE_SEMANTIC_VERSION'] = mod_sem_ver
126127
ENV['MODULE_DOWNLOAD_NAME'] = 'ReJSON'

0 commit comments

Comments
 (0)