MOD-11297: Revamp the CI pipeline, including publishing

.github/workflows/ci.yml

@@ -3,23 +3,9 @@ name: CI
 on: [pull_request]
 
 jobs:
-  get-nightly-version:
-    runs-on: ubuntu-latest
-    outputs:
-      nightly-version: ${{ steps.get-nightly.outputs.version }}
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-      - name: Get nightly version from rust-toolchain.toml
-        id: get-nightly
-        run: |
-          NIGHTLY_VERSION=$(grep 'channel = ' rust-toolchain.toml | sed 's/.*"\(.*\)".*/\1/')
-          echo "version=$NIGHTLY_VERSION" >> $GITHUB_OUTPUT
-
   test:
     name: Build and run the unit tests using the latest rust.
     runs-on: ${{ matrix.os }}
-    needs: get-nightly-version
     strategy:
       fail-fast: false
       matrix:
@@ -33,35 +19,34 @@ jobs:
           - [7-2, "7.2"]
         toolchain:
           - stable
-          - ${{ needs.get-nightly-version.outputs.nightly-version }}
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
-            submodules: recursive
+          submodules: recursive
 
       - name: Checkout redis sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
-            submodules: recursive
-            repository: redis/redis
-            ref: ${{ matrix.redis-version[1] }}
-            path: redis
+          submodules: recursive
+          repository: redis/redis
+          ref: ${{ matrix.redis-version[1] }}
+          path: redis
 
       - name: Install redis
         run: |
-            export HOMEBREW_NO_AUTO_UPDATE=1
-            cd redis
-            make -j
-            ./src/redis-server --version
-            make install PREFIX=/usr/local
-            redis-server --version
+          export HOMEBREW_NO_AUTO_UPDATE=1
+          cd redis
+          make -j
+          ./src/redis-server --version
+          make install PREFIX=/usr/local
+          redis-server --version
 
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-            python-version: '3.10'
+          python-version: "3.10"
 
       - name: Install Clang (for bindgen)
         run: |
@@ -78,26 +63,16 @@ jobs:
 
       - name: Install toolchain
         id: tc
-        uses: dtolnay/rust-toolchain@master
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: ${{ matrix.toolchain }}
           components: rustfmt, clippy
 
-      - name: Setup cache
-        if: runner.os != 'macOS'
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-test-${{ matrix.toolchain }}-${{ hashFiles('**/Cargo.toml') }}
-
       - name: Format
         run: cargo fmt --all -- --check
 
       - name: Clippy
-        run: cargo clippy --all-targets --no-default-features --features min-redis-compatibility-version-${{ matrix.redis-version[0] }},bindgen-runtime
+        run: cargo clippy --workspace --no-default-features --features min-redis-compatibility-version-${{ matrix.redis-version[0] }},bindgen-runtime
 
       - name: Build debug
         run: cargo build --no-default-features --features min-redis-compatibility-version-${{ matrix.redis-version[0] }},bindgen-runtime

.github/workflows/release-pr.yml

@@ -0,0 +1,32 @@
+name: Open a release PR
+
+on:
+  workflow_dispatch: # Manual trigger only
+
+jobs:
+  # Create a PR with the new versions and changelog, preparing the next release.
+  # A release will be automatically published when the PR is merged into master.
+  release-pr:
+    name: Open a release PR
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    concurrency:
+      group: release-plz-${{ github.ref }}
+      cancel-in-progress: false
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Install toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Run release-plz
+        uses: release-plz/action@v0.5
+        with:
+          command: release-pr
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: Release-plz
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  # Release unpublished packages if the latest commit merged
+  # a release PR into master
+  release:
+    name: Publish a new release to crates.io
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Install toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Run release-plz
+        uses: release-plz/action@v0.5
+        with:
+          command: release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -1,11 +1,19 @@
+[workspace]
+members = [".", "redismodule-rs-macros", "redismodule-rs-macros-internals"]
+
+[workspace.package]
+version = "2.0.7"
+license = "BSD-3-Clause"
+edition = "2021"
+
 [package]
 name = "redis-module"
-version = "99.99.99"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
 authors = ["Gavrie Philipson <gavrie@redis.com>", "Guy Korland <guy.korland@redis.com>"]
-edition = "2021"
 build = "build.rs"
 description = "A toolkit for building Redis modules in Rust"
-license = "BSD-3-Clause"
 repository = "https://github.com/RedisLabsModules/redismodule-rs"
 readme = "README.md"
 keywords = ["redis", "plugin"]
@@ -151,6 +159,7 @@ cc = "1"
 default = ["min-redis-compatibility-version-6-0", "bindgen-runtime"]
 
 # xor having minimum compatibility version
+min-redis-compatibility-version-8-0 = ["redis-module/min-redis-compatibility-version-8-0"]
 min-redis-compatibility-version-7-4 = ["redis-module/min-redis-compatibility-version-7-4"]
 min-redis-compatibility-version-7-2 = ["redis-module/min-redis-compatibility-version-7-2"]
 min-redis-compatibility-version-7-0 = ["redis-module/min-redis-compatibility-version-7-0"]

README.md

@@ -2,7 +2,6 @@
 [![Releases](https://img.shields.io/github/release/RedisLabsModules/redismodule-rs.svg)](https://github.com/RedisLabsModules/redismodule-rs/releases/latest)
 [![crates.io](https://img.shields.io/crates/v/redis-module.svg)](https://crates.io/crates/redis-module)
 [![docs](https://docs.rs/redis-module/badge.svg)](https://docs.rs/redis-module)
-[![CircleCI](https://circleci.com/gh/RedisLabsModules/redismodule-rs/tree/master.svg?style=svg)](https://circleci.com/gh/RedisLabsModules/redismodule-rs/tree/master)
 
 # redismodule-rs
 

build.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
-cargo build --all --all-targets --no-default-features --features min-redis-compatibility-version-7-4
+cargo build --all --all-targets --no-default-features --features min-redis-compatibility-version-8-0
 
 

examples/call.rs

@@ -113,7 +113,7 @@ fn call_test(ctx: &Context, _: Vec<RedisString>) -> RedisResult {
     Ok("pass".into())
 }
 
-fn call_blocking_internal(ctx: &Context) -> PromiseCallReply {
+fn call_blocking_internal(ctx: &Context) -> PromiseCallReply<'_, '_> {
     let call_options = CallOptionsBuilder::new().build_blocking();
     ctx.call_blocking("blpop", &call_options, &["list", "1"])
 }

examples/info_handler_macro.rs

@@ -1,11 +1,14 @@
+use redis_module::InfoContext;
 use redis_module::{redis_module, RedisResult};
-use redis_module::{InfoContext, Status};
 use redis_module_macros::info_command_handler;
 
 #[info_command_handler]
 fn add_info(ctx: &InfoContext, _for_crash_report: bool) -> RedisResult<()> {
-    if ctx.add_info_section(Some("info")) == Status::Ok {
-        ctx.add_info_field_str("field", "value");
+    if let Ok(section) = ctx.builder().add_section("info").field("field", "value") {
+        let Ok(section) = section.build_section() else {
+            return Ok(());
+        };
+        let _ = section.build_info();
     }
 
     Ok(())

examples/info_handler_multiple_sections.rs

@@ -17,7 +17,7 @@ fn add_info(ctx: &InfoContext, _for_crash_report: bool) -> RedisResult<()> {
     let data = InfoSection1 {
         field_1: "value1".to_owned(),
     };
-    let _ = ctx.build_one_section(data)?;
+    ctx.build_one_section(data)?;
 
     let data = InfoSection2 {
         field_2: "value2".to_owned(),

examples/keys_pos.rs

@@ -2,7 +2,7 @@ use redis_module::{redis_module, Context, RedisError, RedisResult, RedisString,
 
 fn keys_pos(ctx: &Context, args: Vec<RedisString>) -> RedisResult {
     // Number of args (excluding command name) must be even
-    if (args.len() - 1) % 2 != 0 {
+    if !(args.len() - 1).is_multiple_of(2) {
         return Err(RedisError::WrongArity);
     }