.github/workflows/codeql-analysis.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp', 'python' ]
+        language: [ 'python' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "src/rocksdb"]
 	path = src/rocksdb
-	url = https://github.com/facebook/rocksdb
+	url = https://github.com/lbryio/rocksdb

Dockerfile

@@ -1,33 +0,0 @@
-FROM ubuntu:18.04
-ENV SRC /home/tester/src
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update -y && apt-get install -qy \
-        locales \
-        git \
-        wget \
-        python \
-        python3 \
-        python-dev \
-        python3-dev \
-        python-pip \
-        librocksdb-dev \
-        libsnappy-dev \
-        zlib1g-dev \
-        libbz2-dev \
-        liblz4-dev \
-        && rm -rf /var/lib/apt/lists/*
-
-#NOTE(sileht): really no utf-8 in 2017 !?
-ENV LANG en_US.UTF-8
-RUN update-locale
-RUN locale-gen $LANG
-
-#NOTE(sileht): Upgrade python dev tools
-RUN pip install -U pip tox virtualenv
-
-RUN groupadd --gid 2000 tester
-RUN useradd --uid 2000 --gid 2000 --create-home --shell /bin/bash tester
-USER tester
-
-WORKDIR $SRC

Makefile

@@ -32,8 +32,8 @@ src/rocksdb/librocksdb.a:
 		-Dlz4_LIBRARIES=../lz4-1.9.3/lib \
 		-Dzstd_INCLUDE_DIRS=../zstd-1.4.9/lib \
 		-Dzstd_LIBRARIES=../zstd-1.4.9/lib \
-		-DZLIB_INCLUDE_DIR=../zlib-1.2.11 \
-		-DZLIB_LIBRARY=./zlib-1.2.11 \
+		-DZLIB_INCLUDE_DIR=../zlib-1.2.12 \
+		-DZLIB_LIBRARY=./zlib-1.2.12 \
 		-DCMAKE_CXX_FLAGS="-fPIC -I../snappy-1.1.8/build -I../zstd-1.4.9/lib/dictBuilder" \
 		.. && make -j $(JOBS))
 

setup.py

@@ -59,7 +59,7 @@ if all(map(os.path.exists, STATIC_LIBRARIES)):
     INCLUDE_DIRS = [
         os.path.join("src", "rocksdb", "bzip2-1.0.8"),
         os.path.join("src", "rocksdb", "zstd-1.4.9", "lib"),
-        os.path.join("src", "rocksdb", "zlib-1.2.11"),
+        os.path.join("src", "rocksdb", "zlib-1.2.12"),
         os.path.join("src", "rocksdb", "snappy-1.1.8"),
         os.path.join("src", "rocksdb", "snappy-1.1.8", "build"),
         os.path.join("src", "rocksdb", "lz4-1.9.3", "lib"),

src/rocksdb

@@ -1 +1 @@
-Subproject commit 0103296f39ec3fd89b4cdda9687c63fde90eec24
+Subproject commit 752fea5d4400198bc8a591b7d795d1c8d5f12230