Dependencies update (RedisJSON#981)

rafie · web-flow · commit 02ecad7b1582 · 2023-05-07T14:46:48.000+03:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -81,7 +81,7 @@ commands:
     parameters:
       redis_version:
         type: string
-        default: "7.0"
+        default: "7"
       getredis_params:
         type: string
         default: ""
@@ -143,7 +143,7 @@ commands:
         default: ""
       redis_version:
         type: string
-        default: "7.0"
+        default: "7"
       getredis_params:
         type: string
         default: ""
@@ -341,7 +341,7 @@ jobs:
     parameters:
       redis_version:
         type: string
-        default: "7.0"
+        default: "7"
       persist:
         type: string
         default: "yes"
@@ -599,7 +599,7 @@ workflows:
           context: common
           matrix:
             parameters:
-              platform: [jammy, focal, bionic, xenial, amzn2, rocky8, centos7, bullseye]
+              platform: [jammy, focal, bionic, amzn2, rocky8, centos7, bullseye]
       - build-arm-platforms:
           <<: *on-integ-and-version-tags
           context: common
@@ -672,7 +672,7 @@ workflows:
           name: build-with-redis-<<matrix.redis_version>>
           matrix:
             parameters:
-              redis_version: ["6.0", "6.2", "7", "7.2-rc1", "unstable"]
+              redis_version: ["6.0", "6.2", "7.0", "7.2-rc1", "unstable"]
   
   nightly-perf-once-a-week:
     triggers:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/build/docker/Makefile b/build/docker/Makefile
@@ -5,13 +5,13 @@ include $(ROOT)/deps/readies/mk/main
 
 REPO=rejson
 
-REDIS_VERSION=6.2.10
+REDIS_VERSION=7.2-rc1
 
 OSNICK.official=bullseye
 
-INT_BRANCHES=2.4 2.2 2.0 1.2 1.0
+INT_BRANCHES=2.6 2.4 2.2 2.0 1.2 1.0
 LATEST_BRANCH=2.4
-PREVIEW_BRANCH=2.4
+PREVIEW_BRANCH=2.6
 
 ART_DIR=$(ROOT)/bin/artifacts
 
diff --git a/build/docker/dockerfile.tmpl b/build/docker/dockerfile.tmpl
@@ -1,6 +1,6 @@
 
 #----------------------------------------------------------------------------------------------
-FROM redisfab/redis:{{REDIS_VERSION}}-{{ARCH}}-{{OSNICK}} AS redis
+# FROM redisfab/redis:{{REDIS_VERSION}}-{{ARCH}}-{{OSNICK}} AS redis
 FROM {{OS}} AS builder
 
 RUN if [ -f /root/.profile ]; then sed -ie 's/mesg n/tty -s \&\& mesg -n/g' /root/.profile; fi
@@ -9,12 +9,13 @@ SHELL ["/bin/bash", "-l", "-c"]
 RUN echo "Building for {{OSNICK}} ({{OS}}) for {{ARCH}} [with Redis {{REDIS_VERSION}}]"
 
 WORKDIR /build
-COPY --from=redis /usr/local/ /usr/local/
+# COPY --from=redis /usr/local/ /usr/local/
 
 ADD . /build
 
 RUN ./deps/readies/bin/getupdates
 RUN VERBOSE=1 ./sbin/setup
+RUN ./deps/readies/bin/getredis -v {{REDIS_VERSION}}
 RUN make info
 
 RUN make build SHOW=1
diff --git a/deps/readies b/deps/readies
@@ -1 +1 @@
-Subproject commit 37ddce56939940e808cc63925ae37ca49f57698d
+Subproject commit c6326b818b459d27e5a75ed10f5a3d3a2f9289e4
