Updated readies & more nightly builds (RedisJSON#860)

rafie · web-flow · commit 33de90f591b3 · 2022-11-13T12:42:03.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -304,7 +304,7 @@ commands:
               --fail_fast \
               --triggering_env << parameters.triggering_env >> \
               --push_results_redistimeseries \
-              --allowed-envs << parameters.allowed_envs >>
+              --allowed-envs << parameters.allowed_envs >> || true
 
 #----------------------------------------------------------------------------------------------------------------------------------
 
@@ -503,6 +503,15 @@ on-integ-branch: &on-integ-branch
     tags:
       ignore: /.*/
 
+on-integ-branch-cron: &on-integ-branch-cron
+  filters:
+    branches:
+      only:
+        - master
+        - /^\d+\.\d+.*$/
+        - /^feature-.*$/
+        - /^perf.*$/
+
 not-on-integ-branch: &not-on-integ-branch
   filters:
     branches:
@@ -598,18 +607,13 @@ workflows:
     triggers:
       - schedule:
           cron: "07 20 * * *"
-          filters:
-            branches:
-              only:
-                - master
-                - /^\d+\.\d+.*$/
-                - /^feature-.*$/
+          <<: *on-integ-branch-cron
     jobs:
       - build-linux-debian:
           name: build-with-redis-<<matrix.redis_version>>
           matrix:
             parameters:
-              redis_version: ["6.0", "7", "unstable"]
+              redis_version: ["6.0", "6.2", "7", "unstable"]
       - benchmark-json-oss-standalone:
           context: common
       - benchmark-json-oss-standalone-profiler:
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
@@ -9,12 +9,12 @@ on:
 jobs:
   build:
 
-    runs-on: macos-10.15
+    runs-on: macos-12
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: build
-      uses: vmactions/freebsd-vm@v0.1.6
+      uses: vmactions/freebsd-vm@v0.3.0
       with:
         usesh: true
         sync: rsync
diff --git a/Makefile b/Makefile
@@ -1,10 +1,5 @@
 
-#----------------------------------------------------------------------------------------------
-
 ROOT=.
-ifeq ($(wildcard $(ROOT)/deps/readies/*),)
-___:=$(shell git submodule update --init --recursive &> /dev/null)
-endif
 
 include $(ROOT)/deps/readies/mk/main
 
@@ -14,6 +9,7 @@ define HELPTEXT
 make setup         # install prerequisites
 
 make build
+  NIGHTLY=1        # use nightly toolchain
   DEBUG=1          # build debug variant
   SAN=type         # build with LLVM sanitizer (type=address|memory|leak|thread)
   VALGRIND|VG=1    # build for testing with Valgrind
@@ -85,39 +81,37 @@ RUST_FLAGS=
 RUST_DOCFLAGS=
 
 ifeq ($(DEBUG),1)
-ifeq ($(SAN),)
-TARGET_DIR=$(BINDIR)/target/debug
+	ifeq ($(SAN),)
+		TARGET_DIR=$(BINDIR)/target/debug
+	else
+		NIGHTLY=1
+		CARGO_FLAGS += -Zbuild-std
+		RUST_FLAGS += -Zsanitizer=$(SAN)
+		ifeq ($(SAN),memory)
+			RUST_FLAGS += -Zsanitizer-memory-track-origins
+		endif
+	endif
 else
-NIGHTLY=1
-CARGO_FLAGS += -Zbuild-std
-RUST_FLAGS += -Zsanitizer=$(SAN)
-ifeq ($(SAN),memory)
-RUST_FLAGS += -Zsanitizer-memory-track-origins
-endif
-endif
-else
-CARGO_FLAGS += --release
-TARGET_DIR=$(BINDIR)/target/release
+	CARGO_FLAGS += --release
+	TARGET_DIR=$(BINDIR)/target/release
 endif
 
 ifeq ($(COV),1)
-# NIGHTLY=1
-# RUST_FLAGS += -Zinstrument-coverage
 RUST_FLAGS += -C instrument_coverage
-endif # COV
+endif
 
 ifeq ($(PROFILE),1)
 RUST_FLAGS += -g -C force-frame-pointers=yes
 endif
 
 ifeq ($(NIGHTLY),1)
-TARGET_DIR=$(BINDIR)/target/$(RUST_TARGET)/debug
+	TARGET_DIR=$(BINDIR)/target/$(RUST_TARGET)/debug
 
-ifeq ($(RUST_GOOD_NIGHTLY),)
-CARGO_TOOLCHAIN = +nightly
-else
-CARGO_TOOLCHAIN = +$(RUST_GOOD_NIGHTLY)
-endif
+	ifeq ($(RUST_GOOD_NIGHTLY),)
+		CARGO_TOOLCHAIN = +nightly
+	else
+		CARGO_TOOLCHAIN = +$(RUST_GOOD_NIGHTLY)
+	endif
 endif
 
 export CARGO_TARGET_DIR=$(BINDIR)/target
diff --git a/deps/readies b/deps/readies
@@ -1 +1 @@
-Subproject commit 7333ebb687f3036f486f261c493897a2761fcc09
+Subproject commit 57a5f067bd35e2ed821e914beddb207d98e80f01
