From 2d1e8d020200e5d120ce7d1412d1766fc18fc0f1 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 2 Jul 2020 15:38:10 +0200 Subject: [PATCH 1/2] Also do the kiwix-lib release (for source publication) --- .github/scripts/build_release_nightly.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/build_release_nightly.py b/.github/scripts/build_release_nightly.py index b724b73..28308eb 100755 --- a/.github/scripts/build_release_nightly.py +++ b/.github/scripts/build_release_nightly.py @@ -43,7 +43,7 @@ elif PLATFORM_TARGET.startswith("native_"): elif PLATFORM_TARGET == "native_mixed": TARGETS = ("libzim",) else: - TARGETS = ("zimwriterfs", "zim-tools", "kiwix-tools") + TARGETS = ("zimwriterfs", "zim-tools", "kiwix-lib", "kiwix-tools") elif PLATFORM_TARGET in ("win32_static", "armhf_static", "i586_static"): TARGETS = ("kiwix-tools",) elif PLATFORM_TARGET == "flatpak": From 206ed166e06785c12e319a34bfda3fbacd3eacbe Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 2 Jul 2020 15:30:11 +0200 Subject: [PATCH 2/2] New release of kiwix-tools. --- appveyor.yml | 4 ++-- appveyor/install_kiwix-tools.cmd | 4 ++-- kiwixbuild/versions.py | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b8614ac..1392760 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,8 +9,8 @@ environment: MSYS2_ARG_CONV_EXCL: '-Tp' MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c' MSYSTEM: 'MINGW64' - KIWIX_DESKTOP_VERSION: '2.0.2' - KIWIX_DESKTOP_RELEASE: 0 + KIWIX_DESKTOP_VERSION: '2.0.3' + KIWIX_DESKTOP_RELEASE: 1 init: diff --git a/appveyor/install_kiwix-tools.cmd b/appveyor/install_kiwix-tools.cmd index 96ac8d8..1f3607a 100644 --- a/appveyor/install_kiwix-tools.cmd +++ b/appveyor/install_kiwix-tools.cmd @@ -1,4 +1,4 @@ REM ======================================================== REM Install kiwix-tools -curl -fsSL -O https://download.kiwix.org/release/kiwix-tools/kiwix-tools_win-i686-3.1.1-6.zip || exit /b 1 -7z e kiwix-tools_win-i686-3.1.1-6.zip -o%EXTRA_DIR%\bin kiwix-serve.exe || exit /b 1 +curl -fsSL -O https://download.kiwix.org/release/kiwix-tools/kiwix-tools_win-i686-3.1.2.zip || exit /b 1 +7z e kiwix-tools_win-i686-3.1.2.zip -o%EXTRA_DIR%\bin kiwix-serve.exe || exit /b 1 diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 8993ca8..78b8bb3 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -6,7 +6,7 @@ main_project_versions = { 'kiwix-tools': '3.1.2', # Also need to change this in appveyor/install_kiwix-tools.cmd 'zim-tools': '1.2.1', 'zimwriterfs': '1.3.10', - 'kiwix-desktop': '2.0.2' # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml + 'kiwix-desktop': '2.0.3' # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml # You need to do the release process of kiwix-tools and kiwix-desktop in two separated process. } @@ -32,11 +32,11 @@ main_project_versions = { release_versions = { 'libzim': None, # Depends of base deps (was 0) - 'kiwix-lib': 0, # Depends of libzim (was 1) - 'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 6) + 'kiwix-lib': 0, # Depends of libzim (was 0) + 'kiwix-tools': None, # Depends of kiwix-lib and libzim (was 0) 'zim-tools': None, # Depends of libzim (was 3) 'zimwriterfs': None, # Depends of libzim (was 4) - 'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 0) + 'kiwix-desktop': 0 # Depends of kiwix-lib and libzim (was 0) }