Skip to content

Commit

Permalink
Using libzim 6.3.2
Browse files Browse the repository at this point in the history
Updated worklow for github's env update
  • Loading branch information
rgaudin committed Jun 10, 2021
1 parent f82e388 commit 6c54b23
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 20 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- v*

env:
LIBZIM_VERSION: 6.1.7
LIBZIM_VERSION: 6.3.2
LIBZIM_INCLUDE_PATH: include/zim
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
Expand Down Expand Up @@ -34,20 +34,20 @@ jobs:
- name: set macOS environ
if: matrix.os == 'macos-latest'
run: |
echo ::set-env name=LIBZIM_EXT::dylib
echo ::set-env name=LIBZIM_RELEASE::libzim_macos-x86_64-$LIBZIM_VERSION
echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/libzim.${LIBZIM_VERSION:0:1}.dylib
echo ::set-env name=PLAFTORM_NAME::macosx_10.9_x86_64
echo ::set-env name=RPATH::@loader_path/
echo LIBZIM_EXT=dylib >> $GITHUB_ENV
echo LIBZIM_RELEASE=libzim_macos-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
echo LIBZIM_LIBRARY_PATH=lib/libzim.${LIBZIM_VERSION:0:1}.dylib >> $GITHUB_ENV
echo PLAFTORM_NAME=macosx_10.9_x86_64 >> $GITHUB_ENV
echo RPATH=@loader_path/ >> $GITHUB_ENV
- name: set linux environ
if: matrix.os == 'ubuntu-latest'
run: |
echo ::set-env name=LIBZIM_EXT::so
echo ::set-env name=LIBZIM_RELEASE::libzim_linux-x86_64-$LIBZIM_VERSION
echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION
echo ::set-env name=PLAFTORM_NAME::manylinux1_x86_64
echo ::set-env name=RPATH::\$ORIGIN
echo LIBZIM_EXT=so >> $GITHUB_ENV
echo LIBZIM_RELEASE=libzim_linux-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
echo LIBZIM_LIBRARY_PATH=lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION >> $GITHUB_ENV
echo PLAFTORM_NAME=manylinux1_x86_64 >> $GITHUB_ENV
echo RPATH=\$ORIGIN >> $GITHUB_ENV
- name: Cache libzim dylib & headers
uses: actions/cache@master
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test
on: [push]

env:
LIBZIM_VERSION: 6.1.7
LIBZIM_VERSION: 6.3.2
LIBZIM_INCLUDE_PATH: include/zim
MAX_LINE_LENGTH: 110

Expand All @@ -20,7 +20,7 @@ jobs:

- name: Autoformat with black
run: |
pip install black
pip install black==19.10b0
black --check --exclude=setup.py .
- name: Lint with flake8
Expand Down Expand Up @@ -53,16 +53,16 @@ jobs:
- name: set macOS environ
if: matrix.os == 'macos-latest'
run: |
echo ::set-env name=LIBZIM_EXT::dylib
echo ::set-env name=LIBZIM_RELEASE::libzim_macos-x86_64-$LIBZIM_VERSION
echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/libzim.${LIBZIM_VERSION:0:1}.dylib
echo LIBZIM_EXT=dylib >> $GITHUB_ENV
echo LIBZIM_RELEASE=libzim_macos-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
echo LIBZIM_LIBRARY_PATH=lib/libzim.${LIBZIM_VERSION:0:1}.dylib >> $GITHUB_ENV
- name: set linux environ
if: matrix.os == 'ubuntu-latest'
run: |
echo ::set-env name=LIBZIM_EXT::so
echo ::set-env name=LIBZIM_RELEASE::libzim_linux-x86_64-$LIBZIM_VERSION
echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION
echo LIBZIM_EXT=so >> $GITHUB_ENV
echo LIBZIM_RELEASE=libzim_linux-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
echo LIBZIM_LIBRARY_PATH=lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION >> $GITHUB_ENV
- name: Cache libzim dylib & headers
uses: actions/cache@master
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.1

* Using libzim 6.3.2 which compresses zstd at level 19 which is required
to keep decompression RAM allocation under control on 32b systems

## 0.0.3.post0

* fixed access to bundled libzim on macOS (missing rpath)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def get_long_description():
setup(
# Basic information about libzim module
name="libzim",
version="0.0.3.post0",
version="0.1",
url=GITHUB_URL,
project_urls={
'Source': GITHUB_URL,
Expand Down

0 comments on commit 6c54b23

Please sign in to comment.