upload snapshots for integration branches as well [MOD-6102] (#1132)

RedisJSON · Nov 12, 2023 · ff5c84d · ff5c84d
1 parent 90ba302
commit ff5c84d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -330,13 +330,15 @@ jobs:
       - early-returns
       - build-steps
       - test-steps
+      - persist-artifacts
       - run:
           name: Upload artifacts to S3
           command: |
-            if [[ -n $CIRCLE_BRANCH && "<<parameters.upload>>" == "yes" ]]; then
+            if [[ -n $CIRCLE_BRANCH ]]; then
                 make upload-artifacts SHOW=1
+            else
+                make upload-release SHOW=1
             fi
-      - persist-artifacts
 
   build-macos-m1:
     macos:
@@ -350,13 +352,15 @@ jobs:
       - early-returns
       - build-steps
       - test-steps
+      - persist-artifacts
       - run:
           name: Upload artifacts to S3
           command: |
-            if [[ -n $CIRCLE_BRANCH && "<<parameters.upload>>" == "yes" ]]; then
+            if [[ -n $CIRCLE_BRANCH ]]; then
                 make upload-artifacts SHOW=1 VERBOSE=1
+            else
+                make upload-release SHOW=1
             fi
-      - persist-artifacts
 
   coverage:
     docker:
@@ -410,10 +414,10 @@ jobs:
           command: |
             mkdir -p bin
             ln -s ~/workspace/artifacts bin/artifacts
-            if [[ -n $CIRCLE_TAG && "<<parameters.staging-lab>>" != 1 ]]; then
+            if [[ -n $CIRCLE_TAG ]]; then
                 make upload-release SHOW=1
             else
-                make upload-release SHOW=1 STAGING=1
+                make upload-artifacts SHOW=1
             fi
 
   release-qa-tests:
@@ -527,11 +531,11 @@ workflows:
             parameters:
               platform: [jammy, focal, bionic]
       - build-macos-x64:
-          <<: *on-version-tags
+          <<: *on-integ-and-version-tags
           context: common
       - build-macos-m1:
           context: common
-          <<: *on-version-tags
+          <<: *on-integ-and-version-tags
       - coverage:
           <<: *always
       - sanitize:

diff --git a/sbin/upload-artifacts b/sbin/upload-artifacts
@@ -34,6 +34,7 @@ fi
 
 ARCH=$($READIES/bin/platform --arch)
 [[ $ARCH == x64 ]] && ARCH="x86_64"
+[[ $ARCH == arm64v8 ]] && ARCH="aarch64"
 
 OS=$($READIES/bin/platform --os)
 [[ $OS == linux ]] && OS="Linux"
@@ -51,7 +52,14 @@ OS=$($READIES/bin/platform --os)
 [[ $OSNICK == rocky8 ]]  && OSNICK=rhel8
 [[ $OSNICK == rocky9 ]]  && OSNICK=rhel9
 
-[[ $OSNICK == bigsur ]]  && OSNICK=catalina
+if [[ $OS == macos ]]; then
+	# as we don't build on macOS for every platform, we converge to a least common denominator
+	if [[ $ARCH == x86_64 ]]; then
+		OSNICK=catalina  # to be aligned with the rest of the modules in redis stack
+	else
+		[[ $OSNICK == ventura ]] && OSNICK=monterey
+	fi
+fi
 
 PLATFORM="$OS-$OSNICK-$ARCH"