From 2bed238538ed97bef564c9d49a5a2c39e42044c1 Mon Sep 17 00:00:00 2001
From: Tom Gabsow <tom.gabsow@redis.com>
Date: Mon, 15 Sep 2025 22:17:18 +0300
Subject: [PATCH 1/8] uploading as 99.99.99.YYYYMMDD.HHMMSS.xxx to beta folder

---
 .../upload-artifacts-to-s3-without-make/action.yml   | 12 ++++++++++++
 sbin/upload-artifacts                                | 12 +++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/actions/upload-artifacts-to-s3-without-make/action.yml b/.github/actions/upload-artifacts-to-s3-without-make/action.yml
index 4e510ed40..30e364f50 100644
--- a/.github/actions/upload-artifacts-to-s3-without-make/action.yml
+++ b/.github/actions/upload-artifacts-to-s3-without-make/action.yml
@@ -58,3 +58,15 @@ runs:
               RELEASE=1 SHOW=1 VERBOSE=1 ./sbin/upload-artifacts
             fi
           echo ::endgroup::
+          
+          echo ::group::upload to beta folder with version
+            # Generate beta version for nightly builds
+            TIMESTAMP=$(date -u +"%Y%m%d.%H%M%S")
+            WORKFLOW_NUM=${{ github.run_number }}
+            BETA_VERSION="99.99.99.${TIMESTAMP}.${WORKFLOW_NUM}"
+            echo "Generated beta version: ${BETA_VERSION}"
+            
+            # Upload to beta folder
+            export BETA_VERSION="${BETA_VERSION}"
+            BETA=1 SHOW=1 VERBOSE=1 ./sbin/upload-artifacts
+          echo ::endgroup::
\ No newline at end of file
diff --git a/sbin/upload-artifacts b/sbin/upload-artifacts
index be4f4620a..16ee3b54e 100755
--- a/sbin/upload-artifacts
+++ b/sbin/upload-artifacts
@@ -21,6 +21,7 @@ if [[ $1 == --help || $1 == help || $HELP == 1 ]]; then
 
 		RELEASE=1     Upload release artifacts
 		STAGING=1     Upload into staging area
+		BETA=1        Upload to beta folder with version
 
 		NOP=1         No operation
 		VERBOSE=1     Show artifacts details
@@ -61,6 +62,8 @@ OP=""
 
 if [[ $STAGING == 1 ]]; then
 	S3_URL=s3://redismodules/lab/staging
+elif [[ $BETA == 1 ]]; then
+	S3_URL=s3://redismodules/beta
 else
 	S3_URL=s3://redismodules
 fi
@@ -108,7 +111,14 @@ s3_ls() {
 s3_upload() {
 	local prod_subdir="$PROD"
 	local prefix="$PREFIX"
-	local upload_dir="${S3_URL}/${prod_subdir}${MAYBE_SNAP}"
+	
+	# For beta uploads, include version in the directory structure
+	if [[ $BETA == 1 && -n $BETA_VERSION ]]; then
+		local upload_dir="${S3_URL}/${prod_subdir}/${BETA_VERSION}${MAYBE_SNAP}"
+	else
+		local upload_dir="${S3_URL}/${prod_subdir}${MAYBE_SNAP}"
+	fi
+	
 	local file
 	if [[ $SNAPSHOT == 1 ]]; then
 		for file in `ls ${prefix}.*${PLATFORM}*.zip ${prefix}.*${PLATFORM}*.tgz 2> /dev/null`; do

From 752b84852e502c5f7dafd151127a40eed61a8e63 Mon Sep 17 00:00:00 2001
From: Tom Gabsow <tom.gabsow@redis.com>
Date: Mon, 15 Sep 2025 22:18:18 +0300
Subject: [PATCH 2/8] Use the date for starting the GitLab action workflow for
 the suffix

---
 .../action.yml                                | 24 ++++++++++++-------
 .github/workflows/event-nightly.yml           | 19 ++++++++++++++-
 .github/workflows/flow-alpine.yml             |  9 +++++++
 .github/workflows/flow-azurelinux3-arm.yml    | 11 ++++++++-
 .github/workflows/flow-linux-x86.yml          |  9 +++++++
 .github/workflows/flow-macos.yml              | 11 +++++++++
 .github/workflows/flow-ubuntu-arm.yml         |  9 +++++++
 7 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/.github/actions/upload-artifacts-to-s3-without-make/action.yml b/.github/actions/upload-artifacts-to-s3-without-make/action.yml
index 30e364f50..e6df0b92c 100644
--- a/.github/actions/upload-artifacts-to-s3-without-make/action.yml
+++ b/.github/actions/upload-artifacts-to-s3-without-make/action.yml
@@ -17,6 +17,10 @@ inputs:
     description: 'github ref'
     required: false
     default: ''
+  beta-version:
+    description: 'Beta version for S3 uploads'
+    required: false
+    default: ''
 
 runs:
   using: composite
@@ -60,13 +64,15 @@ runs:
           echo ::endgroup::
           
           echo ::group::upload to beta folder with version
-            # Generate beta version for nightly builds
-            TIMESTAMP=$(date -u +"%Y%m%d.%H%M%S")
-            WORKFLOW_NUM=${{ github.run_number }}
-            BETA_VERSION="99.99.99.${TIMESTAMP}.${WORKFLOW_NUM}"
-            echo "Generated beta version: ${BETA_VERSION}"
-            
-            # Upload to beta folder
-            export BETA_VERSION="${BETA_VERSION}"
-            BETA=1 SHOW=1 VERBOSE=1 ./sbin/upload-artifacts
+            # Use provided beta version if available
+            if [[ -n "${{ inputs.beta-version }}" ]]; then
+              BETA_VERSION="${{ inputs.beta-version }}"
+              echo "Using provided beta version: ${BETA_VERSION}"
+              
+              # Upload to beta folder
+              export BETA_VERSION="${BETA_VERSION}"
+              BETA=1 SHOW=1 VERBOSE=1 ./sbin/upload-artifacts
+            else
+              echo "No beta version provided, skipping beta upload"
+            fi
           echo ::endgroup::
\ No newline at end of file
diff --git a/.github/workflows/event-nightly.yml b/.github/workflows/event-nightly.yml
index 909b2e8d0..4c3b34115 100644
--- a/.github/workflows/event-nightly.yml
+++ b/.github/workflows/event-nightly.yml
@@ -24,41 +24,57 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       redis-ref: ${{ steps.set-env.outputs.redis-ref }}
+      beta-timestamp: ${{ steps.set-env.outputs.beta-timestamp }}
+      beta-version: ${{ steps.set-env.outputs.beta-version }}
     steps:
       - name: set env
         id: set-env
         run: |
           echo "redis-ref=unstable" >> $GITHUB_OUTPUT  # todo change per version/tag
+          
+          # Generate timestamp at workflow start for consistent beta versioning
+          TIMESTAMP=$(date -u +"%Y%m%d.%H%M%S")
+          WORKFLOW_NUM=${{ github.run_number }}
+          BETA_VERSION="99.99.99.${TIMESTAMP}.${WORKFLOW_NUM}"
+          
+          echo "beta-timestamp=${TIMESTAMP}" >> $GITHUB_OUTPUT
+          echo "beta-version=${BETA_VERSION}" >> $GITHUB_OUTPUT
+          echo "Generated beta version: ${BETA_VERSION}"
   linux:
     uses: ./.github/workflows/flow-linux-x86.yml
     needs: [prepare-values]
     with:
       os: bionic focal jammy rocky8 rocky9 bullseye amazonlinux2 mariner2 azurelinux3
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
+      beta-version: ${{needs.prepare-values.outputs.beta-version}}
     secrets: inherit
   ubuntu-arm64:
     uses: ./.github/workflows/flow-ubuntu-arm.yml
     needs: [prepare-values]
     with:
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
+      beta-version: ${{needs.prepare-values.outputs.beta-version}}
     secrets: inherit
   azurelinux3-arm64:
     uses: ./.github/workflows/flow-azurelinux3-arm.yml
     needs: [prepare-values]
     with:
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
+      beta-version: ${{needs.prepare-values.outputs.beta-version}}
     secrets: inherit
   alpine:
     uses: ./.github/workflows/flow-alpine.yml
     needs: [prepare-values]
     with:
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
+      beta-version: ${{needs.prepare-values.outputs.beta-version}}
     secrets: inherit
   macos:
     uses: ./.github/workflows/flow-macos.yml
     needs: [prepare-values]
     with:
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
+      beta-version: ${{needs.prepare-values.outputs.beta-version}}
     secrets: inherit
   linux-valgrind:
     uses: ./.github/workflows/flow-linux-x86.yml
@@ -67,6 +83,7 @@ jobs:
       os: jammy
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
       run_valgrind: true
+      beta-version: ${{needs.prepare-values.outputs.beta-version}}
     secrets: inherit
   linux-sanitizer:
     uses: ./.github/workflows/flow-sanitizer.yml
@@ -80,4 +97,4 @@ jobs:
     secrets: inherit
   linter:
     uses: ./.github/workflows/flow-linter.yml
-    secrets: inherit
+    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/flow-alpine.yml b/.github/workflows/flow-alpine.yml
index 5ab4d4de0..37c704f6b 100644
--- a/.github/workflows/flow-alpine.yml
+++ b/.github/workflows/flow-alpine.yml
@@ -14,6 +14,10 @@ on:
       run-test:
         type: boolean
         default: true
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
   workflow_call: # Allows to run this workflow from another workflow
     inputs:
       redis-ref:
@@ -23,6 +27,10 @@ on:
       run-test:
         type: boolean
         default: true
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
 
 jobs:
   setup-environment:
@@ -111,3 +119,4 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           github-ref: ${{ github.ref }}
+          beta-version: ${{ inputs.beta-version }}
diff --git a/.github/workflows/flow-azurelinux3-arm.yml b/.github/workflows/flow-azurelinux3-arm.yml
index dedd81aa5..d40c4be7e 100644
--- a/.github/workflows/flow-azurelinux3-arm.yml
+++ b/.github/workflows/flow-azurelinux3-arm.yml
@@ -10,6 +10,10 @@ on:
       run-test:
         type: boolean
         default: true
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
   workflow_call: # Allows to run this workflow from another workflow
     inputs:
       redis-ref:
@@ -19,6 +23,10 @@ on:
       run-test:
         type: boolean
         default: true
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
 
 permissions:
   id-token: write # This is required for requesting the JWT
@@ -152,4 +160,5 @@ jobs:
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          github-ref: ${{ github.ref }} 
\ No newline at end of file
+          github-ref: ${{ github.ref }}
+          beta-version: ${{ inputs.beta-version }} 
\ No newline at end of file
diff --git a/.github/workflows/flow-linux-x86.yml b/.github/workflows/flow-linux-x86.yml
index 9ebffc28a..ca9ad9cd0 100644
--- a/.github/workflows/flow-linux-x86.yml
+++ b/.github/workflows/flow-linux-x86.yml
@@ -18,6 +18,10 @@ on:
         description: 'Run valgrind on the tests'
         type: boolean
         default: false
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
   workflow_call: # Allows to run this workflow from another workflow
     inputs:
       redis-ref:
@@ -35,6 +39,10 @@ on:
         description: 'Run valgrind on the tests'
         type: boolean
         default: false
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
       
 jobs:
   setup-environment:
@@ -189,3 +197,4 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           github-ref: ${{ github.ref }}
+          beta-version: ${{ inputs.beta-version }}
diff --git a/.github/workflows/flow-macos.yml b/.github/workflows/flow-macos.yml
index 244fd4731..0b5c766a1 100644
--- a/.github/workflows/flow-macos.yml
+++ b/.github/workflows/flow-macos.yml
@@ -10,6 +10,10 @@ on:
       run-test:
         type: boolean
         default: true
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
   workflow_call: # Allows you to run this workflow manually from the Actions tab
     inputs:
       redis-ref:
@@ -19,6 +23,10 @@ on:
       run-test:
         type: boolean
         default: true
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
 
 jobs:
   setup-environment:
@@ -37,6 +45,7 @@ jobs:
         uses: ./.github/actions/setup-env
         with:
           github-ref: ${{ github.ref }}
+          beta-version: ${{ inputs.beta-version }}
           redis-ref: ${{ inputs.redis-ref }}
   build-macos-x64:
     runs-on: macos-13
@@ -96,6 +105,7 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           github-ref: ${{ github.ref }}
+          beta-version: ${{ inputs.beta-version }}
           
     
   build-macos-m1:
@@ -165,3 +175,4 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           github-ref: ${{ github.ref }}
+          beta-version: ${{ inputs.beta-version }}
diff --git a/.github/workflows/flow-ubuntu-arm.yml b/.github/workflows/flow-ubuntu-arm.yml
index ac575a6d9..bf2580445 100644
--- a/.github/workflows/flow-ubuntu-arm.yml
+++ b/.github/workflows/flow-ubuntu-arm.yml
@@ -10,6 +10,10 @@ on:
       run-test:
         type: boolean
         default: true
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
   workflow_call: # Allows to run this workflow from another workflow
     inputs:
       redis-ref:
@@ -19,6 +23,10 @@ on:
       run-test:
         type: boolean
         default: true
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
 
 permissions:
   id-token: write # This is required for requesting the JWT
@@ -184,3 +192,4 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           github-ref: ${{ github.ref }}
+          beta-version: ${{ inputs.beta-version }}

From ba68e493c8859bdd2d0eb14a66ed250d5a9aa809 Mon Sep 17 00:00:00 2001
From: Tom Gabsow <tom.gabsow@redis.com>
Date: Mon, 15 Sep 2025 22:40:40 +0300
Subject: [PATCH 3/8] fix yamel issue

---
 .github/workflows/event-nightly.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/event-nightly.yml b/.github/workflows/event-nightly.yml
index 4c3b34115..39bf0aea7 100644
--- a/.github/workflows/event-nightly.yml
+++ b/.github/workflows/event-nightly.yml
@@ -17,6 +17,7 @@ on:
     inputs:
       redis-ref:
         description: 'Redis ref to checkout'
+        type: string
         required: true
         default: 'unstable'
 jobs:
@@ -30,7 +31,7 @@ jobs:
       - name: set env
         id: set-env
         run: |
-          echo "redis-ref=unstable" >> $GITHUB_OUTPUT  # todo change per version/tag
+          echo "redis-ref=${{ inputs.redis-ref || 'unstable' }}" >> $GITHUB_OUTPUT
           
           # Generate timestamp at workflow start for consistent beta versioning
           TIMESTAMP=$(date -u +"%Y%m%d.%H%M%S")

From 3e70bac3204e39e84c4785230c692ffded816f8f Mon Sep 17 00:00:00 2001
From: Tom Gabsow <tom.gabsow@redis.com>
Date: Mon, 15 Sep 2025 22:55:11 +0300
Subject: [PATCH 4/8] Update all flows to have the beta version

---
 .github/actions/pack-module/action.yml                   | 8 ++++++++
 .github/actions/setup-env/action.yml                     | 3 +++
 .../upload-artifacts-to-s3-without-make/action.yml       | 7 ++++---
 .github/workflows/event-nightly.yml                      | 9 +++++----
 .github/workflows/flow-alpine.yml                        | 1 +
 .github/workflows/flow-azurelinux3-arm.yml               | 3 +++
 .github/workflows/flow-linux-x86.yml                     | 3 +++
 .github/workflows/flow-sanitizer.yml                     | 4 ++++
 .github/workflows/flow-ubuntu-arm.yml                    | 3 +++
 9 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.github/actions/pack-module/action.yml b/.github/actions/pack-module/action.yml
index 3b958449a..ab3037079 100644
--- a/.github/actions/pack-module/action.yml
+++ b/.github/actions/pack-module/action.yml
@@ -1,5 +1,10 @@
 name: Run pack module script
 
+inputs:
+  beta-version:
+    description: 'Beta version for S3 uploads'
+    required: false
+
 runs:
   using: composite
   steps:
@@ -13,4 +18,7 @@ runs:
         . venv/bin/activate
         git config --global --add safe.directory $GITHUB_WORKSPACE
         export PATH="$GITHUB_WORKSPACE/redis/src:$PATH"
+        if [[ -n "${{ inputs.beta-version }}" ]]; then
+          export BETA_VERSION="${{ inputs.beta-version }}"
+        fi
         BRANCH=$TAG_OR_BRANCH SHOW=1 OSNICK=${{ matrix.docker.nick }} ./sbin/pack.sh $(realpath ./target/release/rejson.so)
diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
index dc460200d..810d3ab45 100644
--- a/.github/actions/setup-env/action.yml
+++ b/.github/actions/setup-env/action.yml
@@ -9,6 +9,9 @@ inputs:
   redis-ref:
     description: Redis ref
     required: false
+  beta-version:
+    description: 'Beta version for S3 uploads'
+    required: false
 
 outputs:
   TAGGED:
diff --git a/.github/actions/upload-artifacts-to-s3-without-make/action.yml b/.github/actions/upload-artifacts-to-s3-without-make/action.yml
index e6df0b92c..a40eeabb0 100644
--- a/.github/actions/upload-artifacts-to-s3-without-make/action.yml
+++ b/.github/actions/upload-artifacts-to-s3-without-make/action.yml
@@ -49,17 +49,18 @@ runs:
           aws configure set region "$AWS_REGION"
 
           echo ::group::upload artifacts
-            SNAPSHOT=1 SHOW=1 VERBOSE=1 ./sbin/upload-artifacts
+            SHOW=1 VERBOSE=1 make upload-artifacts
           echo ::endgroup::
           echo ::group::upload staging release
-            RELEASE=1 SHOW=1 STAGING=1 VERBOSE=1 ./sbin/upload-artifacts
+            STAGING=1 SHOW=1 VERBOSE=1 make upload-artifacts
           echo ::endgroup::
           
           echo ::group::upload production release
             REF="${{ inputs.github-ref }}"
             PATTERN="refs/tags/v[0-9]+.*"
             if [[ $REF =~ $PATTERN ]]; then
-              RELEASE=1 SHOW=1 VERBOSE=1 ./sbin/upload-artifacts
+              echo "This is a tagged build"
+              SHOW=1 VERBOSE=1 make upload-release
             fi
           echo ::endgroup::
           
diff --git a/.github/workflows/event-nightly.yml b/.github/workflows/event-nightly.yml
index 39bf0aea7..8c25ac190 100644
--- a/.github/workflows/event-nightly.yml
+++ b/.github/workflows/event-nightly.yml
@@ -63,15 +63,15 @@ jobs:
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
       beta-version: ${{needs.prepare-values.outputs.beta-version}}
     secrets: inherit
-  alpine:
-    uses: ./.github/workflows/flow-alpine.yml
+  macos:
+    uses: ./.github/workflows/flow-macos.yml
     needs: [prepare-values]
     with:
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
       beta-version: ${{needs.prepare-values.outputs.beta-version}}
     secrets: inherit
-  macos:
-    uses: ./.github/workflows/flow-macos.yml
+  alpine:
+    uses: ./.github/workflows/flow-alpine.yml
     needs: [prepare-values]
     with:
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
@@ -92,6 +92,7 @@ jobs:
     with:
       container: ubuntu:jammy
       redis-ref: ${{needs.prepare-values.outputs.redis-ref}}
+      beta-version: ${{needs.prepare-values.outputs.beta-version}}
     secrets: inherit
   spellcheck:
     uses: ./.github/workflows/flow-spellcheck.yml
diff --git a/.github/workflows/flow-alpine.yml b/.github/workflows/flow-alpine.yml
index 37c704f6b..32f3d53b1 100644
--- a/.github/workflows/flow-alpine.yml
+++ b/.github/workflows/flow-alpine.yml
@@ -50,6 +50,7 @@ jobs:
         with:
           github-ref: ${{ github.ref }}
           redis-ref: ${{ inputs.redis-ref }}
+          beta-version: ${{ inputs.beta-version }}
   build:
     runs-on: ${{matrix.runs_on}}
     needs: setup-environment
diff --git a/.github/workflows/flow-azurelinux3-arm.yml b/.github/workflows/flow-azurelinux3-arm.yml
index d40c4be7e..0475855d0 100644
--- a/.github/workflows/flow-azurelinux3-arm.yml
+++ b/.github/workflows/flow-azurelinux3-arm.yml
@@ -52,6 +52,7 @@ jobs:
         with:
           github-ref: ${{ github.ref }}
           redis-ref: ${{ inputs.redis-ref }}
+          beta-version: ${{ inputs.beta-version }}
 
   azurelinux3-arm64:
     runs-on: ubuntu24-arm64-4-16 # ubuntu24-arm64-2-8
@@ -155,6 +156,8 @@ jobs:
         uses: ./.github/actions/run-tests
       - name: Pack module
         uses: ./.github/actions/pack-module
+        with:
+          beta-version: ${{ inputs.beta-version }}
       - name: Upload artifacts to S3
         uses: ./.github/actions/upload-artifacts-to-s3-without-make
         with:
diff --git a/.github/workflows/flow-linux-x86.yml b/.github/workflows/flow-linux-x86.yml
index ca9ad9cd0..8802ca5e9 100644
--- a/.github/workflows/flow-linux-x86.yml
+++ b/.github/workflows/flow-linux-x86.yml
@@ -63,6 +63,7 @@ jobs:
         with:
           github-ref: ${{ github.ref }}
           redis-ref: ${{ inputs.redis-ref }}
+          beta-version: ${{ inputs.beta-version }}
       - name: Set matrix
         id: set-matrix
         run: |
@@ -190,6 +191,8 @@ jobs:
       - name: Pack module
         if: ${{!inputs.run_valgrind}}
         uses: ./.github/actions/pack-module
+        with:
+          beta-version: ${{ inputs.beta-version }}
       - name: Upload artifacts to S3
         if: ${{!inputs.run_valgrind}}
         uses: ./.github/actions/upload-artifacts-to-s3-without-make
diff --git a/.github/workflows/flow-sanitizer.yml b/.github/workflows/flow-sanitizer.yml
index 9c59d6eb0..fe30823f0 100644
--- a/.github/workflows/flow-sanitizer.yml
+++ b/.github/workflows/flow-sanitizer.yml
@@ -13,6 +13,10 @@ on:
         description: 'Redis ref to checkout'
         type: string
         required: true
+      beta-version:
+        description: 'Beta version for S3 uploads'
+        type: string
+        required: false
 
 jobs:
   clang-sanitizer:
diff --git a/.github/workflows/flow-ubuntu-arm.yml b/.github/workflows/flow-ubuntu-arm.yml
index bf2580445..b04cf628c 100644
--- a/.github/workflows/flow-ubuntu-arm.yml
+++ b/.github/workflows/flow-ubuntu-arm.yml
@@ -53,6 +53,7 @@ jobs:
         with:
           github-ref: ${{ github.ref }}
           redis-ref: ${{ inputs.redis-ref }}
+          beta-version: ${{ inputs.beta-version }}
 
   ubuntu-arm64:
     runs-on: ubuntu24-arm64-4-16 # ubuntu24-arm64-2-8
@@ -186,6 +187,8 @@ jobs:
           MODULE=$(realpath ./target/release/rejson.so) RLTEST_ARGS='--no-progress' ./tests/pytest/tests.sh
       - name: Pack module
         uses: ./.github/actions/pack-module
+        with:
+          beta-version: ${{ inputs.beta-version }}
       - name: Upload artifacts to S3
         uses: ./.github/actions/upload-artifacts-to-s3-without-make
         with:

From f8ff20aa7a3d404cbe43bef5ee173794e8328785 Mon Sep 17 00:00:00 2001
From: Tom Gabsow <tom.gabsow@redis.com>
Date: Tue, 16 Sep 2025 10:50:02 +0300
Subject: [PATCH 5/8] chenging location to be
 s3://redismodules/rejson-oss/beta/

---
 sbin/upload-artifacts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sbin/upload-artifacts b/sbin/upload-artifacts
index 16ee3b54e..05c0cac0e 100755
--- a/sbin/upload-artifacts
+++ b/sbin/upload-artifacts
@@ -62,8 +62,6 @@ OP=""
 
 if [[ $STAGING == 1 ]]; then
 	S3_URL=s3://redismodules/lab/staging
-elif [[ $BETA == 1 ]]; then
-	S3_URL=s3://redismodules/beta
 else
 	S3_URL=s3://redismodules
 fi
@@ -112,9 +110,9 @@ s3_upload() {
 	local prod_subdir="$PROD"
 	local prefix="$PREFIX"
 	
-	# For beta uploads, include version in the directory structure
+	# For beta uploads, include beta in the path: s3://redismodules/rejson-oss/beta/VERSION/
 	if [[ $BETA == 1 && -n $BETA_VERSION ]]; then
-		local upload_dir="${S3_URL}/${prod_subdir}/${BETA_VERSION}${MAYBE_SNAP}"
+		local upload_dir="${S3_URL}/${prod_subdir}/beta/${BETA_VERSION}${MAYBE_SNAP}"
 	else
 		local upload_dir="${S3_URL}/${prod_subdir}${MAYBE_SNAP}"
 	fi

From deb948d412cf06a57d89b45c2663f70afc97aad1 Mon Sep 17 00:00:00 2001
From: Tom Gabsow <tom.gabsow@redis.com>
Date: Tue, 16 Sep 2025 16:20:33 +0300
Subject: [PATCH 6/8] removing the sub directory for etch version

---
 sbin/upload-artifacts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbin/upload-artifacts b/sbin/upload-artifacts
index 05c0cac0e..14723ae13 100755
--- a/sbin/upload-artifacts
+++ b/sbin/upload-artifacts
@@ -110,9 +110,9 @@ s3_upload() {
 	local prod_subdir="$PROD"
 	local prefix="$PREFIX"
 	
-	# For beta uploads, include beta in the path: s3://redismodules/rejson-oss/beta/VERSION/
+	# For beta uploads, put files directly in beta folder: s3://redismodules/rejson-oss/beta/
 	if [[ $BETA == 1 && -n $BETA_VERSION ]]; then
-		local upload_dir="${S3_URL}/${prod_subdir}/beta/${BETA_VERSION}${MAYBE_SNAP}"
+		local upload_dir="${S3_URL}/${prod_subdir}/beta${MAYBE_SNAP}"
 	else
 		local upload_dir="${S3_URL}/${prod_subdir}${MAYBE_SNAP}"
 	fi

From 4133bb1d0a1d87993f9c14355c803292e8ec74cb Mon Sep 17 00:00:00 2001
From: Tom Gabsow <tom.gabsow@redis.com>
Date: Wed, 17 Sep 2025 16:03:25 +0300
Subject: [PATCH 7/8] compatible_redis_version = 99.99

---
 pack/ramp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pack/ramp.yml b/pack/ramp.yml
index 8f4b2874d..03701f426 100644
--- a/pack/ramp.yml
+++ b/pack/ramp.yml
@@ -6,7 +6,7 @@ description: Native JSON Data Type for Redis
 homepage: http://redisjson.io
 license: Redis Source Available License 2.0 (RSALv2) or the Server Side Public License v1 (SSPLv1) or the GNU Affero General Public License version 3 (AGPLv3)
 command_line_args: ""
-compatible_redis_version: "7.4"
+compatible_redis_version: "99.99"
 min_redis_version: "7.4"
 min_redis_pack_version: "7.6.0"
 bigstore_version_2_support: true

From 4ce708a2bece506eca6aaba774b13597bfb4c4e1 Mon Sep 17 00:00:00 2001
From: Tom Gabsow <tom.gabsow@redis.com>
Date: Thu, 18 Sep 2025 17:32:12 +0300
Subject: [PATCH 8/8] fix remarks

---
 .../actions/upload-artifacts-to-s3-without-make/action.yml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/actions/upload-artifacts-to-s3-without-make/action.yml b/.github/actions/upload-artifacts-to-s3-without-make/action.yml
index a40eeabb0..573c0ad3b 100644
--- a/.github/actions/upload-artifacts-to-s3-without-make/action.yml
+++ b/.github/actions/upload-artifacts-to-s3-without-make/action.yml
@@ -49,10 +49,10 @@ runs:
           aws configure set region "$AWS_REGION"
 
           echo ::group::upload artifacts
-            SHOW=1 VERBOSE=1 make upload-artifacts
+            SHOW=1 VERBOSE=1 ./sbin/upload-artifacts
           echo ::endgroup::
           echo ::group::upload staging release
-            STAGING=1 SHOW=1 VERBOSE=1 make upload-artifacts
+            STAGING=1 SHOW=1 VERBOSE=1 ./sbin/upload-artifacts
           echo ::endgroup::
           
           echo ::group::upload production release
@@ -60,7 +60,7 @@ runs:
             PATTERN="refs/tags/v[0-9]+.*"
             if [[ $REF =~ $PATTERN ]]; then
               echo "This is a tagged build"
-              SHOW=1 VERBOSE=1 make upload-release
+              RELEASE=1 SHOW=1 VERBOSE=1 ./sbin/upload-artifacts
             fi
           echo ::endgroup::