Skip to content

Commit

Permalink
Update binaries to Redis 7.0.15
Browse files Browse the repository at this point in the history
  • Loading branch information
eager-signal committed Feb 27, 2024
1 parent 6cc4f15 commit ee5b383
Show file tree
Hide file tree
Showing 13 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Redis embedded server for Java integration testing

Fork Notes
==============
This repository is a fork of https://github.com/ozimov/embedded-redis, which is in turn a fork of https://github.com/kstyrc/embedded-redis. We've updated the embedded Redis binaries to version 6.2.7 so we can write tests that use recent Redis features without imposing dependencies that are not well-encapsulated by a single Maven/Gradle build.
This repository is a fork of https://github.com/ozimov/embedded-redis, which is in turn a fork of https://github.com/kstyrc/embedded-redis. We've updated the embedded Redis binaries to version 7.0.15 so we can write tests that use recent Redis features without imposing dependencies that are not well-encapsulated by a single Maven/Gradle build.

Maven dependency
==============
Expand Down Expand Up @@ -142,10 +142,10 @@ Redis version

By default, RedisServer runs an OS-specific executable enclosed in in the `embedded-redis` jar. The jar includes:

- Redis 6.2.7 for Linux/Unix (i386, x86_64 and arm64)
- Redis 6.2.7 for macOS (x86_64 and arm64e AKA Apple Silicon)
- Redis 7.0.15 for Linux/Unix (i386, x86_64 and arm64)
- Redis 7.0.15 for macOS (x86_64 and arm64e AKA Apple Silicon)

The enclosed binaries are built from source from the [`6.2.7` tag](https://github.com/redis/redis/releases/tag/6.2.7) in the official Redis repository. The Linux and Darwin/macOS binaries are statically-linked amd64 and x86 executables built using the [build-server-binaries.sh](src/main/docker/build-server-binaries.sh) script included in this repository at `/src/main/docker`. Windows binaries are not included because Windows is not officially supported by Redis.
The enclosed binaries are built from source from the [`7.0.15` tag](https://github.com/redis/redis/releases/tag/7.0.15) in the official Redis repository. The Linux and Darwin/macOS binaries are statically-linked amd64 and x86 executables built using the [build-server-binaries.sh](src/main/docker/build-server-binaries.sh) script included in this repository at `/src/main/docker`. Windows binaries are not included because Windows is not officially supported by Redis.

Note: the `build-server-binaries.sh` script attempts to build all of the above noted OS and architectures, which means that it expects the local Docker daemon to support all of them. Docker Desktop on macOS and Windows supports multi-arch builds out of the box; Docker on Linux may require [additional configuration](https://docs.docker.com/buildx/working-with-buildx/).

Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/build-server-binaries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

REDIS_VERSION=6.2.7
REDIS_VERSION=7.0.15
REDIS_TARBALL="redis-${REDIS_VERSION}.tar.gz"
REDIS_URL="https://download.redis.io/releases/${REDIS_TARBALL}"

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/redis/embedded/RedisExecProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class RedisExecProvider {

private final Map<OsArchitecture, String> executables = Maps.newHashMap();

public static final String redisVersion = "6.2.7";
public static final String redisVersion = "7.0.15";

public static RedisExecProvider defaultProvider() {
return new RedisExecProvider();
Expand Down
Binary file removed src/main/resources/redis-server-6.2.7-darwin-amd64
Binary file not shown.
Binary file removed src/main/resources/redis-server-6.2.7-darwin-arm64
Binary file not shown.
Binary file removed src/main/resources/redis-server-6.2.7-linux-386
Binary file not shown.
Binary file removed src/main/resources/redis-server-6.2.7-linux-amd64
Binary file not shown.
Binary file removed src/main/resources/redis-server-6.2.7-linux-arm64
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/main/resources/redis-server-7.0.15-linux-386
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit ee5b383

Please sign in to comment.