Skip to content

Commit ea4028f

Browse files
authored
Merge branch 'main' into feat-ui-redesign-blog
Signed-off-by: Daniel Phillips <[email protected]>
2 parents ba2d1ec + 4a8eaa4 commit ea4028f

25 files changed

+324
-77
lines changed

.github/workflows/zola-deploy.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,17 @@ jobs:
4040
repository: valkey-io/valkey-bloom
4141
path: valkey-bloom
4242

43+
- name: Checkout valkey-json
44+
uses: actions/checkout@v4
45+
with:
46+
repository: valkey-io/valkey-json
47+
path: valkey-json
48+
4349
- name: Init commands, topics and clients
4450
run: |
4551
cd website
4652
./build/init-topics-and-clients.sh ../valkey-doc/topics ../valkey-doc/clients
47-
./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands
53+
./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands ../valkey-json/src/commands
4854
4955
- name: Build only
5056
uses: shalzz/[email protected]

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Valkey.io website
22

33
This repo contains the source for the valkey.io website (build scripts, template, blog posts, stylesheets, etc.).
4-
The build integrates content from [`valkey-io/valkey-doc`](https://github.com/valkey-io/valkey-doc) and the commands definitions from [`valkey-io/valkey`](https://github.com/valkey-io/valkey) and [`valkey-io/valkey-bloom`](https://github.com/valkey-io/valkey-bloom) (see [Build Locally](#build-locally) below for more details).
4+
The build integrates content from [`valkey-io/valkey-doc`](https://github.com/valkey-io/valkey-doc) and the commands definitions from [`valkey-io/valkey`](https://github.com/valkey-io/valkey), [`valkey-io/valkey-bloom`](https://github.com/valkey-io/valkey-bloom), and [`valkey-io/valkey-json`](https://github.com/valkey-io/valkey-json) (see [Build Locally](#build-locally) below for more details)
55

66
## Contributing
77

@@ -64,7 +64,7 @@ Commit your changes to your local copy of `valkey-io/valkey-doc`.
6464
### Building the command reference
6565

6666
The command reference (i.e. `/commands/set/`, `/commands/get/`, `/commands/lolwut/`) sources information from `valkey-io/valkey`, `valkey-io/valkey-bloom`, and `valkey-io/valkey-doc`.
67-
`valkey-io/valkey` and `valkey-io/valkey-bloom` provides the command metadata (items like computational complexity, version history, arguments, etc) whilst `valkey-io/valkey-doc` provides the command description and the command reply.
67+
`valkey-io/valkey`, `valkey-io/valkey-bloom` and `valkey-io/valkey-json` provides the command metadata (items like computational complexity, version history, arguments, etc) whilst `valkey-io/valkey-doc` provides the command description and the command reply.
6868

6969
```mermaid
7070
flowchart TD
@@ -75,13 +75,13 @@ flowchart TD
7575
H --> J[Files: /resp2_replies.json,<br/>/resp3_replies.json] --> Z[Command Reply]
7676
```
7777

78-
Let's say that this repo and your local copy of `valkey-io/valkey-doc`, `valkey-io/valkey-bloom` and `valkey-io/valkey` reside in the same directories.
78+
Let's say that this repo and your local copy of `valkey-io/valkey-doc`, `valkey-io/valkey-bloom`, `valkey-io/valkey-json`, and `valkey-io/valkey` reside in the same directories.
7979
First, stop the `zola serve` process if you're running it.
8080
From the root directory of this repo run:
8181

8282
```shell
8383
# You should only need to run this once or when you add a new command.
84-
./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands
84+
./build/init-commands.sh ../valkey-doc/commands ../valkey/src/commands ../valkey-bloom/src/commands ../valkey-json/src/commands
8585
```
8686

8787
Then, restart Zola.

build-json-command-json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../valkey-json/src/commands

build/init-commands.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,15 @@ if [ ! -d "$3" ]; then
2929
exit 1
3030
fi
3131

32+
if [ ! -d "$4" ]; then
33+
echo "The JSON module command JSON directory must exist and be a valid path"
34+
exit 1
35+
fi
36+
3237
ln -s $1 ./build-command-docs
3338
ln -s $2 ./build-command-json
3439
ln -s $3 ./build-bloom-command-json
40+
ln -s $4 ./build-json-command-json
3541
for fname in $(find $1 -maxdepth 1 -iname "*.md")
3642
do
3743
base=${fname##*/}
@@ -42,6 +48,8 @@ do
4248
metadata_path="/commands/$command.json in the 'valkey' repo"
4349
elif [ -f "$3/$command.json" ]; then
4450
metadata_path="/commands/$command.json in the 'valkey-bloom' repo"
51+
elif [ -f "$4/$command.json" ]; then
52+
metadata_path="/commands/$command.json in the 'valkey-json' repo"
4553
fi
4654
cat << EOF > "./content/commands/$command.md"
4755
+++

config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ highlight_code = true
2222
command_description_path = "../build-command-docs/"
2323
command_json_path = "../build-command-json/"
2424
command_bloom_json_path = "../build-bloom-command-json/"
25+
command_json_json_path = "../build-json-command-json/"
2526
client_json_path = "../build-clients/"
2627
doc_topic_path = "../build-topics/"
2728

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
title: "7.2.9"
3+
date: 2025-04-23
4+
extra:
5+
tag: "7.2.9"
6+
artifact_source: https://download.valkey.io/releases/
7+
artifact_fname: "valkey"
8+
container_registry:
9+
-
10+
name: "Docker Hub"
11+
link: https://hub.docker.com/r/valkey/valkey/
12+
id: "valkey/valkey"
13+
tags:
14+
- "7.2.9"
15+
- "7.2.9-bookworm"
16+
- "7.2.9-alpine"
17+
- "7.2.9-alpine3.21"
18+
packages:
19+
20+
artifacts:
21+
- distro: jammy
22+
arch:
23+
- arm64
24+
- x86_64
25+
- distro: noble
26+
arch:
27+
- arm64
28+
- x86_64
29+
---
30+
31+
Valkey 7.2.9 Release

content/download/releases/v8-0-0.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ extra:
1818
packages:
1919

2020
artifacts:
21+
- distro: bionic
22+
arch:
23+
- arm64
24+
- x86_64
2125
- distro: focal
2226
arch:
2327
- arm64

content/download/releases/v8-0-1.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ extra:
1818
packages:
1919

2020
artifacts:
21+
- distro: bionic
22+
arch:
23+
- arm64
24+
- x86_64
2125
- distro: focal
2226
arch:
2327
- arm64

content/download/releases/v8-0-2.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ extra:
1818
packages:
1919

2020
artifacts:
21+
- distro: bionic
22+
arch:
23+
- arm64
24+
- x86_64
2125
- distro: focal
2226
arch:
2327
- arm64
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
title: "8.0.3"
3+
date: 2025-04-23
4+
extra:
5+
tag: "8.0.3"
6+
artifact_source: https://download.valkey.io/releases/
7+
artifact_fname: "valkey"
8+
container_registry:
9+
-
10+
name: "Docker Hub"
11+
link: https://hub.docker.com/r/valkey/valkey/
12+
id: "valkey/valkey"
13+
tags:
14+
- "8.0.3"
15+
- "8.0.3-bookworm"
16+
- "8.0.3-alpine"
17+
- "8.0.3-alpine3.21"
18+
packages:
19+
20+
artifacts:
21+
- distro: jammy
22+
arch:
23+
- arm64
24+
- x86_64
25+
- distro: noble
26+
arch:
27+
- arm64
28+
- x86_64
29+
---
30+
31+
Valkey 8.0.3 Release

0 commit comments

Comments
 (0)