Skip to content

Commit b09121d

Browse files
committed
Another attempt at fixing github builds.
1 parent 029e771 commit b09121d

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

.github/workflows/build.yml

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,26 @@ jobs:
2626

2727
- name: 'Install dependencies'
2828
run: |
29-
sudo apt install -y libsnappy-dev libbz2-dev liblz4-dev libz-dev libgflags-dev libzstd-dev python3-pytest
29+
sudo apt install -y libsnappy-dev libbz2-dev liblz4-dev libz-dev libgflags-dev libzstd-dev
3030
3131
- name: 'Install RocksDB ${{ matrix.rocksdb_ver }}'
3232
run: |
33-
pushd /opt
34-
git clone https://github.com/facebook/rocksdb
35-
cd rocksdb
36-
git reset --hard ${{ matrix.rocksdb_ver }}
37-
CXXFLAGS='-flto -Os -s' PORTABLE=1 make shared_lib -j 4
38-
make shared_lib
39-
sudo make install-shared
33+
pushd /opt &&
34+
git clone https://github.com/facebook/rocksdb &&
35+
cd rocksdb &&
36+
git reset --hard ${{ matrix.rocksdb_ver }} &&
37+
CXXFLAGS='-flto -Os -s' PORTABLE=1 make shared_lib -j 4 &&
38+
make shared_lib &&
39+
sudo make install-shared &&
4040
popd
4141
42-
- name: Test with pytest
42+
- name: Install python-rocksdb
4343
run: |
44-
pytest-3 rocksdb/tests
44+
sudo python3 setup.py install
45+
46+
- name: Run tests
47+
run: |
48+
python3 setup.py test
4549
4650
build_wheels:
4751
name: 'Build wheels'
@@ -68,16 +72,16 @@ jobs:
6872
CIBW_MANYLINUX_X86_64_IMAGE: 'manylinux2014'
6973
CIBW_BUILD: 'cp3*'
7074
CIBW_SKIP: '*-manylinux_i686'
71-
CIBW_TEST_REQUIRES: '.[test]'
72-
CIBW_TEST_COMMAND: 'pytest {project}/rocksdb/tests'
75+
CIBW_TEST_REQUIRES: '.[test] pytest'
76+
CIBW_TEST_COMMAND: 'python3 -m pytest {project}/rocksdb/tests'
7377
CIBW_BEFORE_BUILD: |
74-
apt install -y libsnappy-dev libbz2-dev liblz4-dev libz-dev python3-pytest
75-
pushd /opt
76-
git clone https://github.com/facebook/rocksdb
77-
cd rocksdb
78-
git reset --hard $ROCKSDB_VERSION
79-
CXXFLAGS='-flto -Os -s' PORTABLE=1 make shared_lib -j 4
80-
make install-shared
78+
yum install -y bzip2-devel lz4-devel snappy-devel zlib-devel &&
79+
pushd /opt &&
80+
git clone https://github.com/facebook/rocksdb &&
81+
cd rocksdb &&
82+
git reset --hard $ROCKSDB_VERSION &&
83+
CXXFLAGS='-flto -Os -s' PORTABLE=1 make shared_lib -j 4 &&
84+
make install-shared &&
8185
popd
8286
8387
- uses: actions/upload-artifact@v2

0 commit comments

Comments
 (0)