From 8524dfab87aeab859685158697d833c3085c5a8c Mon Sep 17 00:00:00 2001 From: Kelson Date: Tue, 26 Nov 2019 11:15:28 +0100 Subject: [PATCH] Release Kiwix Desktop 2.0 rc4 --- appveyor.yml | 4 ++-- appveyor/install_git_ninja_pkgconfig.cmd | 2 +- kiwixbuild/versions.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 78f8979..96fbc0f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: MSYS2_ARG_CONV_EXCL: '-Tp' MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c' MSYSTEM: 'MINGW64' - KIWIX_DESKTOP_VERSION: '2.0-rc3' + KIWIX_DESKTOP_VERSION: '2.0-rc4' KIWIX_DESKTOP_RELEASE: 1 init: @@ -30,7 +30,7 @@ install: 7z e ninja-win.zip -o%EXTRA_DIR%\bin REM Install pkg-config-lite - curl -o pkg-config-lite-0.28-1.zip https://netix.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip + curl --insecure -o pkg-config-lite-0.28-1.zip https://netix.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip 7z e pkg-config-lite-0.28-1.zip -o%EXTRA_DIR%\bin pkg-config-lite-0.28-1/bin/pkg-config.exe cd kiwix-build diff --git a/appveyor/install_git_ninja_pkgconfig.cmd b/appveyor/install_git_ninja_pkgconfig.cmd index 65e21db..ecaf702 100644 --- a/appveyor/install_git_ninja_pkgconfig.cmd +++ b/appveyor/install_git_ninja_pkgconfig.cmd @@ -9,6 +9,6 @@ curl -fsSL -o ninja-win.zip https://github.com/ninja-build/ninja/releases/downlo 7z e ninja-win.zip -o%EXTRA_DIR%\bin || exit /b 1 REM Set pkg-config-lit -curl -fsSL -o pkg-config-lite-0.28-1.zip https://netix.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip || exit /b 1 +curl --insecure -fsSL -o pkg-config-lite-0.28-1.zip https://netix.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip || exit /b 1 7z e pkg-config-lite-0.28-1.zip -o%EXTRA_DIR%\bin pkg-config-lite-0.28-1/bin/pkg-config.exe || exit /b 1 cd kiwix-build diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 0097109..432d40f 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -6,7 +6,7 @@ main_project_versions = { 'libzim': '6.0.2', 'zim-tools': '1.0.5', 'zimwriterfs': '1.3.7', - 'kiwix-desktop': '2.0-rc3' # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml + 'kiwix-desktop': '2.0-rc4' # 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. } @@ -33,10 +33,10 @@ main_project_versions = { release_versions = { 'libzim': None, # Depends of base deps (was 0) 'kiwix-lib': None, # Depends of libzim (was 0) - 'kiwix-tools': 7, # Depends of kiwix-lib and libzim (was 6) + 'kiwix-tools': None, # Depends of kiwix-lib and libzim (was 6) 'zim-tools': None, # Depends of libzim (was 7) 'zimwriterfs': None, # Depends of libzim (was 1) - 'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 0) + 'kiwix-desktop': 0 # Depends of kiwix-lib and libzim (was 0) }