Skip to content

Use Valkey-swift instead of Redistack #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ concurrency:
cancel-in-progress: true

env:
REDIS_HOSTNAME: redis
VALKEY_HOSTNAME: valkey
jobs:
linux:
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
matrix:
image: ["swift:6.0", "swift:6.1", "swiftlang/swift:nightly-6.2-noble"]
image: ["swift:6.1", "swiftlang/swift:nightly-6.2-noble"]
container:
image: ${{ matrix.image }}
services:
redis:
image: redis
valkey:
image: valkey/valkey
ports:
- 6379:6379
options: --entrypoint redis-server
options: --entrypoint valkey-server

steps:
- name: Checkout
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Convert coverage files
run: |
llvm-cov export -format="lcov" \
.build/debug/swift-jobs-redisPackageTests.xctest \
.build/debug/swift-jobs-valkeyPackageTests.xctest \
-ignore-filename-regex="\/Tests\/" \
-ignore-filename-regex="\/Benchmarks\/" \
-instr-profile .build/debug/codecov/default.profdata > info.lcov
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:

env:
REDIS_HOSTNAME: redis
VALKEY_HOSTNAME: valkey
jobs:
linux:
runs-on: ubuntu-latest
Expand All @@ -15,11 +15,11 @@ jobs:
container:
image: swiftlang/swift:${{ matrix.image }}
services:
redis:
image: redis
valkey:
image: valkey/valkey
ports:
- 6379:6379
options: --entrypoint redis-server
options: --entrypoint valkey-server

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .spi.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version: 1
external_links:
documentation: "https://docs.hummingbird.codes/2.0/documentation/jobsredis"
documentation: "https://docs.hummingbird.codes/2.0/documentation/jobsvalkey"
14 changes: 7 additions & 7 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
import PackageDescription

let package = Package(
name: "swift-jobs-redis",
name: "swift-jobs-valkey",
platforms: [.macOS(.v15), .iOS(.v18), .tvOS(.v18)],
products: [
.library(name: "JobsRedis", targets: ["JobsRedis"])
.library(name: "JobsValkey", targets: ["JobsValkey"])
],
dependencies: [
.package(url: "https://github.com/hummingbird-project/swift-jobs.git", from: "1.0.0-rc"),
.package(url: "https://github.com/swift-server/RediStack.git", from: "1.6.2"),
.package(url: "https://github.com/valkey-io/valkey-swift", branch: "main"),
],
targets: [
.target(
name: "JobsRedis",
name: "JobsValkey",
dependencies: [
.product(name: "Jobs", package: "swift-jobs"),
.product(name: "RediStack", package: "RediStack"),
.product(name: "Valkey", package: "valkey-swift"),
]
),
.testTarget(
name: "JobsRedisTests",
name: "JobsValkeyTests",
dependencies: [
.byName(name: "JobsRedis"),
.byName(name: "JobsValkey"),
.product(name: "Jobs", package: "swift-jobs"),
]
),
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
<a href="https://swift.org">
<img src="https://img.shields.io/badge/swift-5.9-brightgreen.svg"/>
</a>
<a href="https://github.com/hummingbird-project/swift-jobs-redis/actions?query=workflow%3ACI">
<img src="https://github.com/hummingbird-project/swift-jobs-redis/actions/workflows/ci.yml/badge.svg?branch=main"/>
<a href="https://github.com/hummingbird-project/swift-jobs-valkey/actions?query=workflow%3ACI">
<img src="https://github.com/hummingbird-project/swift-jobs-valkey/actions/workflows/ci.yml/badge.svg?branch=main"/>
</a>
<a href="https://discord.gg/7ME3nZ7mP2">
<img src="https://img.shields.io/badge/chat-discord-brightgreen.svg"/>
</a>
</p>

# Redis driver for Jobs
# Valkey/Redis driver for Jobs

Redis is an open source, in-memory data structure store, used as a database, cache, and message broker.
Valkey is an open source, in-memory data structure store, used as a database, cache, and message broker.

## Documentation

Reference documentation for JobsRedis can be found [here](https://docs.hummingbird.codes/2.0/documentation/jobsredis)
Reference documentation for JobsValkey can be found [here](https://docs.hummingbird.codes/2.0/documentation/jobsvalkey)
228 changes: 0 additions & 228 deletions Sources/JobsRedis/RedisJobQueue+scripts.swift

This file was deleted.

Loading
Loading