diff --git a/.circleci/config.yml b/.circleci/config.yml index f4605b9..e87130d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,7 @@ jobs: name: Package command: | cargo build --all --all-targets --release - ramp pack -m ramp.yml -o ./target/release/$PACKAGE_NAME.{os}-{architecture}.$CIRCLE_BRANCH.zip ./target/release/$MODULE_ARTIFACT + ramp pack -m ramp.yml -n RedisJSON -o ./target/release/$PACKAGE_NAME.{os}-{architecture}.$CIRCLE_BRANCH.zip ./target/release/$MODULE_ARTIFACT # - run: # name: Upload Coverage @@ -71,11 +71,11 @@ jobs: - "~/.cargo" - "./target" - # - run: - # name: Deploy to S3 - # command: >- - # aws s3 cp ./target/release/ s3://redismodules/$PACKAGE_NAME/ --acl - # public-read --recursive --exclude "*" --include "*.zip" + - run: + name: Deploy to S3 + command: >- + aws s3 cp ./target/release/ s3://redismodules/$PACKAGE_NAME/ --acl + public-read --recursive --exclude "*" --include "*.zip" # - run: # name: Run all tests diff --git a/README.md b/README.md index e3d1b6e..038b4c2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +# This repository was deprecated and all future development was moved to https://github.com/RedisJSON/RedisJSON + + [![GitHub issues](https://img.shields.io/github/release/RedisJSON/RedisJSON2.svg)](https://github.com/RedisJSON/RedisJSON2/releases/latest) [![CircleCI](https://circleci.com/gh/RedisJSON/RedisJSON2/tree/master.svg?style=svg)](https://circleci.com/gh/RedisJSON/RedisJSON2/tree/master) [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/redislabs/redisjson2.svg)](https://hub.docker.com/r/redislabs/redisjson2/builds/) @@ -81,6 +84,14 @@ cargo build --release ## Run +### Linux + ``` redis-server --loadmodule ./target/release/libredisjson.so ``` + +### Mac OS + +``` +redis-server --loadmodule ./target/release/libredisjson.dylib +``` diff --git a/ramp.yml b/ramp.yml index cedb3fc..9331aff 100644 --- a/ramp.yml +++ b/ramp.yml @@ -1,12 +1,12 @@ -display_name: RedisJSON +display_name: RedisJSON2 author: Redis Labs email: redismodules@redislabs.com description: Native JSON Data Type for Redis homepage: http://redisjson.io license: Redis Source Available License Agreement command_line_args: "" -min_redis_version: "4.0" -min_redis_pack_version: "5.0" +min_redis_version: "5.0" +min_redis_pack_version: "5.4" capabilities: - types - no_multi_key diff --git a/src/lib.rs b/src/lib.rs index a81f518..4cc68e0 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -762,7 +762,7 @@ pub extern "C" fn init(raw_ctx: *mut rawmod::RedisModuleCtx) -> c_int { } redis_module! { - name: "ReJSON", + name: "RedisJSON", version: 999999, data_types: [ REDIS_JSON_TYPE, diff --git a/src/redisjson.rs b/src/redisjson.rs index 16a63b3..1800f7d 100644 --- a/src/redisjson.rs +++ b/src/redisjson.rs @@ -58,7 +58,7 @@ impl Path { fixed.insert_str(0, "$."); } } - Path{path, fixed} + Path { path, fixed } } } diff --git a/src/schema.rs b/src/schema.rs index 7d76f6c..8093509 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -1,7 +1,7 @@ use std::os::raw::{c_int, c_void}; -use redisearch_api::Index; use redis_module::raw; +use redisearch_api::Index; use crate::error::Error; use std::collections::HashMap;