Skip to content

Commit

Permalink
fixup! Test on Debian Trixie & update RocksDB to 9.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
romanz committed Feb 15, 2025
1 parent 5a9e665 commit 582f620
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 21 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:
- name: Install Rust
run: rustup component add rustfmt clippy

- name: Install other dependencies
run: sudo apt install build-essential libclang-dev

- name: Format
run: cargo fmt --all -- --check

Expand Down
21 changes: 5 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ctrlc = "=3.4.2"
signal-hook = "0.3"

[dependencies.rust-rocksdb]
version = "0.27.1"
version = "0.36"

default-features = false
# ZSTD is used for data compression
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# The maintainers of electrs are not deeply familiar with Docker, so you should DYOR.
# If you are not familiar with Docker either it's probably be safer to NOT use it.

FROM debian:testing-slim AS base
FROM debian:trixie-slim AS base
RUN apt-get update -qqy
RUN apt-get install -qqy librocksdb-dev curl

### Electrum Rust Server ###
FROM base AS electrs-build
RUN apt-get install -qqy cargo clang cmake
RUN apt-get install -qqy cargo build-essential libclang-dev

# Install electrs
WORKDIR /build/electrs
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# The maintainers of electrs are not deeply familiar with Docker, so you should DYOR.
# If you are not familiar with Docker either it's probably be safer to NOT use it.

FROM debian:testing-slim as base
FROM debian:trixie-slim as base
RUN apt-get update -qqy
RUN apt-get install -qqy librocksdb-dev wget

### Electrum Rust Server ###
FROM base as electrs-build
RUN apt-get install -qqy cargo clang cmake
RUN apt-get install -qqy cargo build-essential libclang-dev

# Install electrs
WORKDIR /build/electrs
Expand Down

0 comments on commit 582f620

Please sign in to comment.