Build updates (RedisJSON#922)

rafie · web-flow · commit ed7b5dab88b5 · 2023-01-30T19:43:53.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -377,7 +377,7 @@ jobs:
 
   build-macos:
     macos:
-      xcode: 11.7.0
+      xcode: 12.5.1
     resource_class: macos.x86.medium.gen2
     parameters:
       upload:
diff --git a/deps/readies b/deps/readies
@@ -1 +1 @@
-Subproject commit d0e65688e09a4ce8746b5809e44eaa31026d8a4f
+Subproject commit d225f34075cff9c916638f7555c728ba5ec2ae91
diff --git a/sbin/get-redisearch b/sbin/get-redisearch
@@ -71,6 +71,8 @@ else
 		else
 			nick="rhel7"
 		fi
+	elif [[ $OSNICK == bigsur ]]; then
+		nick=catalina
 	else
 		nick="$($READIES/bin/platform --osnick)"
 	fi
diff --git a/sbin/pack.sh b/sbin/pack.sh
@@ -59,8 +59,11 @@ OSNICK=$($READIES/bin/platform --osnick)
 [[ $OSNICK == jammy ]]   && OSNICK=ubuntu22.04
 [[ $OSNICK == centos7 ]] && OSNICK=rhel7
 [[ $OSNICK == centos8 ]] && OSNICK=rhel8
+[[ $OSNICK == ol8 ]]     && OSNICK=rhel8
 [[ $OSNICK == rocky8 ]]  && OSNICK=rhel8
 
+[[ $OSNICK == bigsur ]]  && OSNICK=catalina
+
 #----------------------------------------------------------------------------------------------
 
 if [[ -z $MODULE || ! -f $MODULE ]]; then
@@ -159,7 +162,7 @@ pack_deps() {
 	sha256sum $tar_path | awk '{print $1}' > $tar_path.sha256
 
 	cd $ARTDIR/snapshots
-	if [[ ! -z $BRANCH ]]; then
+	if [[ -n $BRANCH ]]; then
 		local snap_dep=$stem.${BRANCH}${VARIANT}.tgz
 		ln -sf ../$fq_dep $snap_dep
 		ln -sf ../$fq_dep.sha256 $snap_dep.sha256
diff --git a/sbin/setup b/sbin/setup
@@ -9,4 +9,16 @@ READIES=$ROOT/deps/readies
 export HOMEBREW_NO_AUTO_UPDATE=1
 
 $READIES/bin/getpy3
+pyenv="$(get_profile_d)/pyenv.sh"
+if [[ -f $pyenv ]]; then
+	. $pyenv
+fi
+if [[ $VERBOSE == 1 ]]; then
+	python3 --version
+	python3 -m pip list
+fi
+
 $ROOT/sbin/system-setup.py
+if [[ $VERBOSE == 1 ]]; then
+	python3 -m pip list
+fi
diff --git a/sbin/upload-artifacts b/sbin/upload-artifacts
@@ -49,6 +49,8 @@ OS=$($READIES/bin/platform --os)
 [[ $OSNICK == ol8 ]] && OSNICK=rhel8
 [[ $OSNICK == rocky8 ]] && OSNICK=rhel8
 
+[[ $OSNICK == bigsur ]]  && OSNICK=catalina
+
 PLATFORM="$OS-$OSNICK-$ARCH"
 
 #----------------------------------------------------------------------------------------------
@@ -103,8 +105,8 @@ s3_ls() {
 }
 
 s3_upload() {
-	local prod_subdir="$1"
-	local prefix="$2"
+	local prod_subdir="$PROD"
+	local prefix="$PREFIX"
 	local upload_dir="${S3_URL}/${prod_subdir}${MAYBE_SNAP}"
 	local file
 	if [[ $SNAPSHOT == 1 ]]; then
@@ -129,4 +131,4 @@ if [[ $NOP != 1 ]]; then
 	fi
 fi
 
-s3_upload rejson-oss rejson-oss
+PROD=rejson-oss PREFIX=rejson-oss s3_upload
