Skip to content

Commit 6c54b23

Browse files
author
renaud gaudin
committed
Using libzim 6.3.2
Updated worklow for github's env update
1 parent f82e388 commit 6c54b23

File tree

4 files changed

+25
-20
lines changed

4 files changed

+25
-20
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- v*
77

88
env:
9-
LIBZIM_VERSION: 6.1.7
9+
LIBZIM_VERSION: 6.3.2
1010
LIBZIM_INCLUDE_PATH: include/zim
1111
TWINE_USERNAME: __token__
1212
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
@@ -34,20 +34,20 @@ jobs:
3434
- name: set macOS environ
3535
if: matrix.os == 'macos-latest'
3636
run: |
37-
echo ::set-env name=LIBZIM_EXT::dylib
38-
echo ::set-env name=LIBZIM_RELEASE::libzim_macos-x86_64-$LIBZIM_VERSION
39-
echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/libzim.${LIBZIM_VERSION:0:1}.dylib
40-
echo ::set-env name=PLAFTORM_NAME::macosx_10.9_x86_64
41-
echo ::set-env name=RPATH::@loader_path/
37+
echo LIBZIM_EXT=dylib >> $GITHUB_ENV
38+
echo LIBZIM_RELEASE=libzim_macos-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
39+
echo LIBZIM_LIBRARY_PATH=lib/libzim.${LIBZIM_VERSION:0:1}.dylib >> $GITHUB_ENV
40+
echo PLAFTORM_NAME=macosx_10.9_x86_64 >> $GITHUB_ENV
41+
echo RPATH=@loader_path/ >> $GITHUB_ENV
4242
4343
- name: set linux environ
4444
if: matrix.os == 'ubuntu-latest'
4545
run: |
46-
echo ::set-env name=LIBZIM_EXT::so
47-
echo ::set-env name=LIBZIM_RELEASE::libzim_linux-x86_64-$LIBZIM_VERSION
48-
echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION
49-
echo ::set-env name=PLAFTORM_NAME::manylinux1_x86_64
50-
echo ::set-env name=RPATH::\$ORIGIN
46+
echo LIBZIM_EXT=so >> $GITHUB_ENV
47+
echo LIBZIM_RELEASE=libzim_linux-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
48+
echo LIBZIM_LIBRARY_PATH=lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION >> $GITHUB_ENV
49+
echo PLAFTORM_NAME=manylinux1_x86_64 >> $GITHUB_ENV
50+
echo RPATH=\$ORIGIN >> $GITHUB_ENV
5151
5252
- name: Cache libzim dylib & headers
5353
uses: actions/cache@master

.github/workflows/test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: test
22
on: [push]
33

44
env:
5-
LIBZIM_VERSION: 6.1.7
5+
LIBZIM_VERSION: 6.3.2
66
LIBZIM_INCLUDE_PATH: include/zim
77
MAX_LINE_LENGTH: 110
88

@@ -20,7 +20,7 @@ jobs:
2020

2121
- name: Autoformat with black
2222
run: |
23-
pip install black
23+
pip install black==19.10b0
2424
black --check --exclude=setup.py .
2525
2626
- name: Lint with flake8
@@ -53,16 +53,16 @@ jobs:
5353
- name: set macOS environ
5454
if: matrix.os == 'macos-latest'
5555
run: |
56-
echo ::set-env name=LIBZIM_EXT::dylib
57-
echo ::set-env name=LIBZIM_RELEASE::libzim_macos-x86_64-$LIBZIM_VERSION
58-
echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/libzim.${LIBZIM_VERSION:0:1}.dylib
56+
echo LIBZIM_EXT=dylib >> $GITHUB_ENV
57+
echo LIBZIM_RELEASE=libzim_macos-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
58+
echo LIBZIM_LIBRARY_PATH=lib/libzim.${LIBZIM_VERSION:0:1}.dylib >> $GITHUB_ENV
5959
6060
- name: set linux environ
6161
if: matrix.os == 'ubuntu-latest'
6262
run: |
63-
echo ::set-env name=LIBZIM_EXT::so
64-
echo ::set-env name=LIBZIM_RELEASE::libzim_linux-x86_64-$LIBZIM_VERSION
65-
echo ::set-env name=LIBZIM_LIBRARY_PATH::lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION
63+
echo LIBZIM_EXT=so >> $GITHUB_ENV
64+
echo LIBZIM_RELEASE=libzim_linux-x86_64-$LIBZIM_VERSION >> $GITHUB_ENV
65+
echo LIBZIM_LIBRARY_PATH=lib/x86_64-linux-gnu/libzim.so.$LIBZIM_VERSION >> $GITHUB_ENV
6666
6767
- name: Cache libzim dylib & headers
6868
uses: actions/cache@master

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.1
2+
3+
* Using libzim 6.3.2 which compresses zstd at level 19 which is required
4+
to keep decompression RAM allocation under control on 32b systems
5+
16
## 0.0.3.post0
27

38
* fixed access to bundled libzim on macOS (missing rpath)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def get_long_description():
9393
setup(
9494
# Basic information about libzim module
9595
name="libzim",
96-
version="0.0.3.post0",
96+
version="0.1",
9797
url=GITHUB_URL,
9898
project_urls={
9999
'Source': GITHUB_URL,

0 commit comments

Comments
 (0)