RockyLinux 9 support (RedisJSON#1099)

rafie · web-flow · commit aa208e7aec65 · 2023-10-01T15:11:00.000+03:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -599,7 +599,7 @@ workflows:
           context: common
           matrix:
             parameters:
-              platform: [jammy, focal, bionic, centos7, rocky8, bullseye, amzn2]
+              platform: [jammy, focal, bionic, centos7, rocky8, rocky9, bullseye, amzn2]
       - build-arm-platforms:
           <<: *on-integ-and-version-tags
           context: common
diff --git a/build/docker/Makefile b/build/docker/Makefile
@@ -5,12 +5,12 @@ include $(ROOT)/deps/readies/mk/main
 
 REPO=rejson
 
-REDIS_VERSION=7.2-rc2
+REDIS_VERSION=7.2.1
 
 OSNICK.official=bullseye
 
 INT_BRANCHES=2.6 2.4 2.2 2.0 1.2 1.0
-LATEST_BRANCH=2.4
+LATEST_BRANCH=2.6
 PREVIEW_BRANCH=2.6
 
 ART_DIR=$(ROOT)/bin/artifacts
diff --git a/deps/readies b/deps/readies
@@ -1 +1 @@
-Subproject commit e5f70f48172b4bfd4e15e47bf99fc0c7f890f4da
+Subproject commit 3b1d2f256f76d03534d7424ef71936fa1a572676
diff --git a/sbin/get-redisearch b/sbin/get-redisearch
@@ -66,7 +66,9 @@ else
 			nick=ubuntu18.04
 		fi
 	elif [[ $dist == centos || $dist == redhat || $dist == fedora || $dist == ol ]]; then
-		if [[ $nick == centos8 || $nick == ol8 || $nick == rocky8 ]]; then
+		if [[ $nick == centos9 || $nick == ol9 || $nick == rocky9 || $nick == rhel9 ]]; then
+			nick="rhel9"
+		elif [[ $nick == centos8 || $nick == ol8 || $nick == rocky8 ]]; then
 			nick="rhel8"
 		else
 			nick="rhel7"
diff --git a/sbin/pack.sh b/sbin/pack.sh
@@ -69,6 +69,7 @@ OSNICK=$($READIES/bin/platform --osnick)
 [[ $OSNICK == centos8 ]] && OSNICK=rhel8
 [[ $OSNICK == ol8 ]]     && OSNICK=rhel8
 [[ $OSNICK == rocky8 ]]  && OSNICK=rhel8
+[[ $OSNICK == rocky9 ]]  && OSNICK=rhel9
 
 [[ $OSNICK == bigsur ]]  && OSNICK=catalina
 
diff --git a/sbin/system-setup.py b/sbin/system-setup.py
@@ -32,7 +32,8 @@ def debian_compat(self):
         self.run(f"{READIES}/bin/getgcc")
 
     def redhat_compat(self):
-        self.install("redhat-lsb-core")
+        if self.dist == "centos" and self.os_version[0] < 9:
+            self.install("redhat-lsb-core")
         self.install("which")
         self.run(f"{READIES}/bin/getgcc --modern")
 
diff --git a/sbin/upload-artifacts b/sbin/upload-artifacts
@@ -39,15 +39,16 @@ OS=$($READIES/bin/platform --os)
 [[ $OS == linux ]] && OS="Linux"
 
 [[ -z $OSNICK ]] && OSNICK=$($READIES/bin/platform --osnick)
-[[ $OSNICK == trusty ]] && OSNICK=ubuntu14.04
-[[ $OSNICK == xenial ]] && OSNICK=ubuntu16.04
-[[ $OSNICK == bionic ]] && OSNICK=ubuntu18.04
-[[ $OSNICK == focal ]] && OSNICK=ubuntu20.04
-[[ $OSNICK == jammy ]] && OSNICK=ubuntu22.04
+[[ $OSNICK == trusty ]]  && OSNICK=ubuntu14.04
+[[ $OSNICK == xenial ]]  && OSNICK=ubuntu16.04
+[[ $OSNICK == bionic ]]  && OSNICK=ubuntu18.04
+[[ $OSNICK == focal ]]   && OSNICK=ubuntu20.04
+[[ $OSNICK == jammy ]]   && OSNICK=ubuntu22.04
 [[ $OSNICK == centos7 ]] && OSNICK=rhel7
 [[ $OSNICK == centos8 ]] && OSNICK=rhel8
-[[ $OSNICK == ol8 ]] && OSNICK=rhel8
-[[ $OSNICK == rocky8 ]] && OSNICK=rhel8
+[[ $OSNICK == ol8 ]]     && OSNICK=rhel8
+[[ $OSNICK == rocky8 ]]  && OSNICK=rhel8
+[[ $OSNICK == rocky9 ]]  && OSNICK=rhel9
 
 [[ $OSNICK == bigsur ]]  && OSNICK=catalina
 
