Compare commits

..

6 commits

Author SHA1 Message Date
Jack Robison
3c1664f8dd
manylinux_2_24_x86_64 2022-03-27 14:17:04 -04:00
Jack Robison
cd0f5f3f15
fix build 2022-03-26 16:25:57 -04:00
Jack Robison
66d25e9554
update setup.py 2022-03-26 16:25:57 -04:00
Jack Robison
2528ace020
codeql 2022-03-26 15:19:52 -04:00
Jack Robison
1f80cc90b3
update tox to run unit tests 2022-03-26 15:19:13 -04:00
Jack Robison
fa611addc4
remove ununsed dockerfile 2022-03-26 15:18:48 -04:00
6 changed files with 8 additions and 8 deletions

View file

@ -6,9 +6,10 @@ on:
push: push:
branches: branches:
- master - master
- github-actions
jobs: jobs:
manylinux: manylinux:
runs-on: ubuntu-18.04 runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -26,7 +27,7 @@ jobs:
src/rocksdb/libz.a src/rocksdb/libz.a
src/rocksdb/librocksdb.a src/rocksdb/librocksdb.a
- name: Install requirements - name: Install requirements
run: sudo apt-get install build-essential binutils cmake python3-cffi run: sudo apt-get install build-essential binutils cmake python3-cffi python3.8-dev python3.9-dev
- name: Make static library files - name: Make static library files
if: steps.build-cache.outputs.cache-hit != 'true' if: steps.build-cache.outputs.cache-hit != 'true'
run: make clean && make run: make clean && make

2
.gitmodules vendored
View file

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

View file

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

View file

@ -11,7 +11,6 @@ function build_wheel() {
build_wheel cp37-cp37m build_wheel cp37-cp37m
build_wheel cp38-cp38 build_wheel cp38-cp38
build_wheel cp39-cp39 build_wheel cp39-cp39
build_wheel cp310-cp310
build_wheel pp37-pypy37_pp73 build_wheel pp37-pypy37_pp73
cd dist cd dist

View file

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

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