Merge pull request #655 from RedisAI/ck-1.2-cherries

cherry-pick master CI changes

Author: alonre24

.circleci/config.yml

@@ -359,7 +359,7 @@ jobs:
             echo "... done."
             du -ah --apparent-size *
             cd snapshots
-            for f in *.tgz; do
+            for f in `ls *.zip *.tgz`; do
               aws s3 cp --no-progress $f s3://redismodules/$PACKAGE_NAME/snapshots/ --acl public-read
             done
 
@@ -376,7 +376,7 @@ jobs:
           command: |
             cd workspace/artifacts
             du -ah --apparent-size *
-            for f in *.tgz; do
+            for f in `ls *.zip *.tgz`; do
               aws s3 cp --no-progress $f s3://redismodules/$PACKAGE_NAME/ --acl public-read
             done
 

opt/Makefile

@@ -36,7 +36,7 @@ make build      # compile and link
   PROFILE=1       # enable profiling compile flags (and debug symbols) for release type.
                   # You can consider this as build type release with debug symbols and -fno-omit-frame-pointer
   VARIANT=name    # build variant `name`
-  WHY=1           # explain CMake decisions (into /tmp/cmake.why) 
+  WHY=1           # explain CMake decisions (into /tmp/cmake.why)
 make clean      # remove build artifacts
   ALL=1           # remove entire artifacts directory
 make install    # create ready-to-run scheme (module and engines)
@@ -79,7 +79,7 @@ device selection options (fetch, build, and test):
   JETSON=1      # build for Nvidia Jetson
 endef
 
-#---------------------------------------------------------------------------------------------- 
+#----------------------------------------------------------------------------------------------
 
 override GPU:=$(or $(findstring $(CUDA),1),$(findstring $(GPU),1))
 
@@ -97,7 +97,7 @@ DEPS_FLAGS += CPU=1
 DEVICE=cpu
 endif
 
-#---------------------------------------------------------------------------------------------- 
+#----------------------------------------------------------------------------------------------
 
 SRCDIR=..
 BINDIR=$(BINROOT)/src
@@ -110,7 +110,7 @@ INSTALLED_TARGET=$(INSTALL_DIR)/redisai.so
 
 BACKENDS_PATH ?= $(INSTALL_DIR)/backends
 
-#---------------------------------------------------------------------------------------------- 
+#----------------------------------------------------------------------------------------------
 
 CMAKE_FILES += \
 	$(SRCDIR)/CMakeLists.txt \
@@ -165,7 +165,7 @@ include $(MK)/defs
 
 include $(MK)/rules
 
-#---------------------------------------------------------------------------------------------- 
+#----------------------------------------------------------------------------------------------
 
 #prebuild:
 #	$(SHOW)if [ ! -d $(DEPS_DIR) ]; then echo $$'Dependencies are not in place.\nPlease run \'make fetch\'.'; exit 1; fi
@@ -190,7 +190,7 @@ else
 	-$(SHOW)$(MAKE) -C $(BINDIR) clean
 endif
 
-#---------------------------------------------------------------------------------------------- 
+#----------------------------------------------------------------------------------------------
 
 setup:
 	@echo Setting up system...
@@ -222,9 +222,9 @@ endif
 pack: $(INSTALLED_TARGET)
 	$(SHOW)find $(INSTALL_DIR) -name "*.so" -exec chmod +x {} \;
 	$(SHOW)mkdir -p $(ROOT)/bin/artifacts
-	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) ./pack.sh
-	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) VARIANT=lite ./pack.sh
-	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) DEPS=$(PACK_DEPS) VARIANT=rce  ./pack.sh
+	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=$(PACK_DEPS) ./pack.sh
+	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=$(PACK_DEPS) VARIANT=lite ./pack.sh
+	$(SHOW)DEVICE=$(DEVICE) BINDIR=$(ROOT)/bin/artifacts INSTALL_DIR=$(INSTALL_DIR) BRANCH=$(BRANCH) RAMP=1 DEPS=$(PACK_DEPS) VARIANT=rce  ./pack.sh
 
 #----------------------------------------------------------------------------------------------
 

opt/pack.sh

@@ -14,7 +14,7 @@ fi
 if [[ $1 == --help || $1 == help ]]; then
 	cat <<-END
 		pack.sh [cpu|gpu] [--help|help]
-		
+
 		Argument variables:
 		DEVICE=cpu|gpu    CPU or GPU variants
 		RAMP=1            Build RAMP file
@@ -81,7 +81,7 @@ pack_ramp() {
 		local packdir=snapshots
 		local s3base=snapshots/
 	fi
-	
+
 	local fq_package=$stem.${verspec}.zip
 
 	[[ ! -d $BINDIR/$packdir ]] && mkdir -p $BINDIR/$packdir
@@ -104,7 +104,7 @@ pack_ramp() {
 	if [[ -z $VARIANT ]]; then
 		local rampfile=ramp.yml
 	else
-		local rampfile=ramp-${VARIANT}.yml
+		local rampfile=ramp${VARIANT}.yml
 	fi
 
 	python3 $READIES/xtx \
@@ -124,21 +124,21 @@ pack_ramp() {
 
 pack_deps() {
 	local depname="$1"
-	
+
 	cd $ROOT
 
 	local platform="$OS-$OSNICK-$ARCH"
 	local stem=${PACKAGE_NAME}-${DEVICE}-${depname}.${platform}
 	local fq_package=$stem.${SEMVER}${VARIANT}.tgz
 	local tar_path=$BINDIR/$fq_package
 	local backends_prefix_dir=""
-	
+
 	if [[ $depname == all ]]; then
 		local backends_dir=.
 	else
 		local backends_dir=${PRODUCT}_$depname
 	fi
-	
+
 	cd $INSTALL_DIR/backends
 	{ find $backends_dir -name "*.so*" | \
 	  xargs tar -c --sort=name --owner=root:0 --group=root:0 --mtime='UTC 1970-01-01' --transform "s,^,$backends_prefix_dir," 2>> /tmp/pack.err | \