CircleCI: macOS/M1 (RedisJSON#943)

rafie · web-flow · commit 41fd0e4df285 · 2023-03-20T18:10:43.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -382,7 +382,7 @@ jobs:
       - vm-build-platforms-steps:
           platform: <<parameters.platform>>
 
-  build-macos:
+  build-macos-x64:
     macos:
       xcode: 12.5.1
     resource_class: macos.x86.medium.gen2
@@ -402,6 +402,26 @@ jobs:
             fi
       - persist-artifacts
 
+  build-macos-m1:
+    macos:
+      xcode: 14.2.0
+    resource_class: macos.m1.large.gen1
+    parameters:
+      upload:
+        type: string
+        default: "yes"
+    steps:
+      - early-returns
+      - build-steps
+      - test-steps
+      - run:
+          name: Upload artifacts to S3
+          command: |
+            if [[ -n $CIRCLE_BRANCH && "<<parameters.upload>>" == "yes" ]]; then
+                make upload-artifacts SHOW=1 VERBOSE=1
+            fi
+      - persist-artifacts
+
   coverage:
     docker:
       - image: redisfab/rmbuilder:6.2.7-x64-focal
@@ -585,10 +605,13 @@ workflows:
           context: common
           matrix:
             parameters:
-              platform: [jammy, bionic, focal]
-      - build-macos:
+              platform: [jammy, focal, bionic]
+      - build-macos-x64:
           <<: *on-integ-and-version-tags
           context: common
+      - build-macos-m1:
+          context: common
+          <<: *on-integ-and-version-tags
       - coverage:
           <<: *on-any-branch
       - sanitize:
@@ -605,15 +628,17 @@ workflows:
           requires:
             - build-platforms
             - build-arm-platforms
-            - build-macos
+            - build-macos-x64
+            - build-macos-m1
       - upload-artifacts:
           name: upload-release-artifacts
           <<: *on-version-tags
           context: common
           requires:
             - build-platforms
             - build-arm-platforms
-            - build-macos
+            - build-macos-x64
+            - build-macos-m1
       - release-qa-tests:
           <<: *on-version-tags
           context: common
@@ -662,3 +687,14 @@ workflows:
           context: common
       - benchmark-json-oss-standalone-profiler:
           context: common
+
+  nightly-twice-a-week:
+    triggers:
+      - schedule:
+          cron: "20 17 * * 0,3"
+          <<: *on-integ-branch-cron
+    jobs:
+      - build-macos-x64:
+          upload: "no"
+      - build-macos-m1:
+          upload: "no"
diff --git a/tests/pytest/requirements.txt b/tests/pytest/requirements.txt
@@ -1,5 +1,5 @@
-redis ~= 4.3.4
-RLTest ~= 0.5.8
+redis ~= 4.5.0
+RLTest ~= 0.6.0
 ramp-packer ~= 2.5.2
 six >= 1.10.0
 psutil >= 5.8.0
