New docker build and artifacts upload (RedisJSON#664)

rafie · web-flow · commit 0bf108c3997a · 2022-02-23T20:23:43.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -57,6 +57,7 @@ commands:
           command: |
             git submodule update --init deps/readies
             ./deps/readies/bin/getpy3
+            python3 -m pip install awscli
 
   install-prerequisites:
     parameters:
@@ -66,15 +67,17 @@ commands:
       getredis_params:
         type: string
         default: ""
+      system_setup_params:
+        type: string
+        default: ""
     steps:
       - setup-automation
       - run:
           name: System setup
           shell: /bin/bash -l -eo pipefail
           command: |
-            python3 -m pip list -v
-            ./sbin/system-setup.py
-            python3 -m pip list -v
+            ./sbin/system-setup.py <<parameters.system_setup_params>>
+            python3 -m pip list
             source $HOME/.cargo/env
             rustc --version
             cargo --version
@@ -359,7 +362,7 @@ jobs:
 
   coverage:
     docker:
-      - image: redisfab/rmbuilder:6.2.5-x64-bullseye
+      - image: redisfab/rmbuilder:6.2.5-x64-bionic
     steps:
       - early-returns
       - checkout-all
@@ -431,6 +434,8 @@ jobs:
     docker:
       - image: redisfab/rmbuilder:6.2.5-x64-bullseye
     steps:
+      - early-returns
+      - early-return-for-forked-pull-requests
       - checkout
       - setup-automation
       - run:
diff --git a/Makefile b/Makefile
@@ -178,7 +178,7 @@ else
 	$(SHOW)set -e ;\
 	export RUSTFLAGS="$(RUST_FLAGS)" ;\
 	export RUSTDOCFLAGS="$(RUST_DOCFLAGS)" ;\
-	cargo ${CARGO_TOOLCHAIN} build --target $(RUST_TARGET) $(CARGO_FLAGS)
+	cargo $(CARGO_TOOLCHAIN) build --target $(RUST_TARGET) $(CARGO_FLAGS)
 endif
 	$(SHOW)cp $(TARGET_DIR)/librejson.$(RUST_SOEXT.$(OS)) $(TARGET)
 ifneq ($(DEBUG),1)
diff --git a/sbin/pack.sh b/sbin/pack.sh
@@ -48,8 +48,6 @@ SYM=${SYM:-1}
 mkdir -p $ARTDIR $ARTDIR/snapshots
 ARTDIR=$(cd $ARTDIR && pwd)
 
-. $READIES/bin/enable-utf8
-
 export ARCH=$($READIES/bin/platform --arch)
 export OS=$($READIES/bin/platform --os)
 export OSNICK=$($READIES/bin/platform --osnick)
diff --git a/sbin/system-setup.py b/sbin/system-setup.py
@@ -23,8 +23,7 @@ def common_first(self):
 
         if self.osnick == 'ol8':
             self.install("tar")
-        if not self.has_command("clang"):
-            self.run("%s/bin/getclang --modern" % READIES)
+        self.run("%s/bin/getclang --modern" % READIES)
         if not self.has_command("rustc"):
             self.run("%s/bin/getrust" % READIES)
         self.run("%s/bin/getcmake --usr" % READIES)
diff --git a/tests/qa/qatests b/tests/qa/qatests
@@ -158,8 +158,7 @@ class Test:
 @click.option('--nop', is_flag=True, default=False, help='Dry run')
 @click.option('--verbose', '-v', is_flag=True, default=False, help='Be verbose')
 @click.option('--verbosity', type=int, default=0, help='Verbosity level')
-def main(token, test, modver, snapshot, rsver, osnick, common, quick, nop, verbose, verbosity, *args, **kwargs):
-    BB()
+def main(token, test, modver, snapshot, rsver, osnick, quick, nop, verbose, verbosity, *args, **kwargs):
     global NOP, VERBOSE
     VERBOSE = 1 if verbose else verbosity
     NOP = nop
