From 1598bc823e36a611eeb913707d22b7ef774db97d Mon Sep 17 00:00:00 2001 From: Vadim Lebedev Date: Wed, 3 Aug 2022 14:22:21 +0200 Subject: [PATCH 1/3] Add missing dependecies --- .github/workflows/build-wheels.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheels.yaml b/.github/workflows/build-wheels.yaml index 9334d95..1005821 100644 --- a/.github/workflows/build-wheels.yaml +++ b/.github/workflows/build-wheels.yaml @@ -31,7 +31,7 @@ jobs: - name: Install dependencies run: | yum install -y epel-release libxml2-devel libzstd-devel xz-devel bzip2-devel - yum install -y libacl-devel openssl-devel + yum install -y libacl-devel lz4-devel e2fsprogs-devel libb2-devel lzo-devel openssl-devel yum install -y librichacl-devel swig strace - name: Install python tools @@ -86,7 +86,7 @@ jobs: draft: false prerelease: false release_name: Release ${{ steps.version.outputs.version }} - tag_name: V${{ steps.version.outputs.version }} + tag_name: V${{ steps.version.outputs.version }}-p1 env: GITHUB_TOKEN: ${{ github.token }} From 104b2c2ccad03207991ff9ca0a5bbac8997bc150 Mon Sep 17 00:00:00 2001 From: Vadim Lebedev Date: Wed, 3 Aug 2022 17:23:09 +0200 Subject: [PATCH 2/3] Optimize workflow --- .github/workflows/build-wheels.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-wheels.yaml b/.github/workflows/build-wheels.yaml index 1005821..b26ab36 100644 --- a/.github/workflows/build-wheels.yaml +++ b/.github/workflows/build-wheels.yaml @@ -53,23 +53,19 @@ jobs: run: | rm -rf build wheelhouse touch libarchive/_libarchive.i - export LD_LIBRARY_PATH=/usr/local/lib64/:/usr/local/lib:$LD_LIBRARY_PATH - export LIBARCHIVE_PREFIX=/usr/local + echo LD_LIBRARY_PATH=/usr/local/lib64/:/usr/local/lib:$LD_LIBRARY_PATH >>$GITHUB_ENV + echo LIBARCHIVE_PREFIX=/usr/local >>$GITHUB_ENV python3 setup.py install - name: Build wheels run: | - export LD_LIBRARY_PATH=/usr/local/lib64/:/usr/local/lib:$LD_LIBRARY_PATH - export LIBARCHIVE_PREFIX=/usr/local python3 -m pip wheel --wheel-dir dist/ . auditwheel repair dist/*.whl python3 -m pip install --force-reinstall wheelhouse/*.whl - name: version run: | - export LD_LIBRARY_PATH=/usr/local/lib64/:/usr/local/lib:$LD_LIBRARY_PATH - export LIBARCHIVE_PREFIX=/usr/local echo "::set-output name=version::$(cd /tmp; python3 -c 'import libarchive; print(libarchive.version())')" id: version @@ -86,7 +82,7 @@ jobs: draft: false prerelease: false release_name: Release ${{ steps.version.outputs.version }} - tag_name: V${{ steps.version.outputs.version }}-p1 + tag_name: V${{ steps.version.outputs.version }}-${{ github.ref_name }}-${{ github.run_number }} env: GITHUB_TOKEN: ${{ github.token }} From 8194803759ddb9ab4d1d8f58ddd5ac86b53160a0 Mon Sep 17 00:00:00 2001 From: Vadim Lebedev Date: Wed, 3 Aug 2022 17:31:15 +0200 Subject: [PATCH 3/3] Fix python copmile step --- .github/workflows/build-wheels.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-wheels.yaml b/.github/workflows/build-wheels.yaml index b26ab36..1b2e80c 100644 --- a/.github/workflows/build-wheels.yaml +++ b/.github/workflows/build-wheels.yaml @@ -49,12 +49,15 @@ jobs: cd ../.. - - name: Compile pyhton modules + - name: Prepare build environment run: | rm -rf build wheelhouse touch libarchive/_libarchive.i echo LD_LIBRARY_PATH=/usr/local/lib64/:/usr/local/lib:$LD_LIBRARY_PATH >>$GITHUB_ENV echo LIBARCHIVE_PREFIX=/usr/local >>$GITHUB_ENV + + - name: Compile pyhton modules + run: | python3 setup.py install