From 334b1f81cc241d152628d4b08e18e02ddc411b10 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Thu, 29 Aug 2024 19:14:40 +0200 Subject: [PATCH] Do not build kiwix-desktop using Appveyor CI Fix #521, #425 --- appveyor.yml | 69 ----------------------- appveyor/build_xapian.sh | 16 ------ appveyor/create_cache.sh | 11 ---- appveyor/deploy.sh | 21 ------- appveyor/fix_desktop_makefile.py | 29 ---------- appveyor/install_aria2.cmd | 4 -- appveyor/install_dirent.cmd | 3 - appveyor/install_git_ninja_pkgconfig.cmd | 14 ----- appveyor/install_icu.cmd | 7 --- appveyor/install_kiwix-desktop.cmd | 22 -------- appveyor/install_libcurl.cmd | 14 ----- appveyor/install_libkiwix.cmd | 10 ---- appveyor/install_libmicrohttpd.cmd | 11 ---- appveyor/install_libzim.cmd | 9 --- appveyor/install_lzma.cmd | 6 -- appveyor/install_mustache.cmd | 3 - appveyor/install_pthread.cmd | 14 ----- appveyor/install_pugixml.cmd | 10 ---- appveyor/install_xapian.cmd | 9 --- appveyor/install_zlib.cmd | 10 ---- appveyor/install_zstd.cmd | 10 ---- appveyor/kiwix.pfx.enc | Bin 5424 -> 0 bytes appveyor/nightlybot_id_key.enc | Bin 3264 -> 0 bytes appveyor/package_kiwix-desktop.sh | 35 ------------ appveyor/setup_from_cache.cmd | 4 -- kiwixbuild/versions.py | 8 +-- 26 files changed, 1 insertion(+), 348 deletions(-) delete mode 100644 appveyor.yml delete mode 100644 appveyor/build_xapian.sh delete mode 100644 appveyor/create_cache.sh delete mode 100755 appveyor/deploy.sh delete mode 100644 appveyor/fix_desktop_makefile.py delete mode 100644 appveyor/install_aria2.cmd delete mode 100644 appveyor/install_dirent.cmd delete mode 100644 appveyor/install_git_ninja_pkgconfig.cmd delete mode 100644 appveyor/install_icu.cmd delete mode 100644 appveyor/install_kiwix-desktop.cmd delete mode 100644 appveyor/install_libcurl.cmd delete mode 100644 appveyor/install_libkiwix.cmd delete mode 100644 appveyor/install_libmicrohttpd.cmd delete mode 100644 appveyor/install_libzim.cmd delete mode 100644 appveyor/install_lzma.cmd delete mode 100644 appveyor/install_mustache.cmd delete mode 100644 appveyor/install_pthread.cmd delete mode 100644 appveyor/install_pugixml.cmd delete mode 100644 appveyor/install_xapian.cmd delete mode 100644 appveyor/install_zlib.cmd delete mode 100644 appveyor/install_zstd.cmd delete mode 100644 appveyor/kiwix.pfx.enc delete mode 100644 appveyor/nightlybot_id_key.enc delete mode 100644 appveyor/package_kiwix-desktop.sh delete mode 100644 appveyor/setup_from_cache.cmd diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index fe974d85e..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,69 +0,0 @@ -image: Visual Studio 2019 -version: '0.1.{build}' -environment: - EXTRA_DIR: 'C:\extra' - MINGW64_EXTRA_DIR: '/c/extra' - PATH: 'C:\\Python312\\Scripts;%PATH%;%EXTRA_DIR%\bin;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\%platform%' - PKG_CONFIG_PATH: '%EXTRA_DIR%\lib\pkgconfig' - MSYS2_PATH_TYPE: 'inherit' - MSYS2_ARG_CONV_EXCL: '-Tp' - MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c' - MSYSTEM: 'MINGW64' - KIWIX_DESKTOP_VERSION: '2.3.1-3' - KIWIX_DESKTOP_RELEASE: 0 - - -init: - - cmd: | - echo %TEST_VAR% - REM Set VC 2019 - "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - mkdir C:\extra\bin - -install: - - cmd: | - cd C:\projects - REM Install meson - C:\Python312\Scripts\pip install meson - - REM Install ninja - curl -o ninja-win.zip -L https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip - 7z e ninja-win.zip -o%EXTRA_DIR%\bin - - REM Install pkg-config-lite - curl -o pkg-config-lite-0.28-1.zip -L https://deac-fra.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 - - REM Install openssh (scp) for deployement - choco install openssh openssl.light - - - cmd: openssl enc -d -aes-256-cbc -md sha256 -pass pass:%ENC_PASSWD% -in appveyor\nightlybot_id_key.enc -out appveyor\nightlybot_id_key - - - -build_script: - - IF "%USE_CACHE%" EQU "1" appveyor\setup_from_cache.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_zlib.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_lzma.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_zstd.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_libcurl.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_pthread.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_dirent.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_xapian.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_icu.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_pugixml.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_aria2.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_mustache.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_libmicrohttpd.cmd - - IF "%USE_CACHE%" NEQ "1" %MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/create_cache.sh" - - appveyor\install_libzim.cmd - - appveyor\install_libkiwix.cmd - - appveyor\install_kiwix-desktop.cmd - -before_deploy: - - cmd: openssl enc -d -pbkdf2 -aes-256-cbc -md sha256 -pass pass:%win_certificate_secret% -in appveyor\kiwix.pfx.enc -out appveyor\kiwix.pfx - - cmd: '%MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/package_kiwix-desktop.sh"' - -deploy_script: - - cmd: '%MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/deploy.sh"' diff --git a/appveyor/build_xapian.sh b/appveyor/build_xapian.sh deleted file mode 100644 index 9d4ad5774..000000000 --- a/appveyor/build_xapian.sh +++ /dev/null @@ -1,16 +0,0 @@ - -XAPIAN_SOURCE=$(pwd)/.. - -$XAPIAN_SOURCE/configure \ - CC="cl -nologo" \ - CXX="$XAPIAN_SOURCE/compile cl -nologo" \ - CXXFLAGS="-EHsc -MD" AR=lib \ - CPPFLAGS="-I${MINGW64_EXTRA_DIR}/include" \ - LDFLAGS="-L${MINGW64_EXTRA_DIR}/lib" \ - --disable-backend-remote \ - --disable-documentation \ - --prefix=${MINGW64_EXTRA_DIR} - -make -j2 - -make install diff --git a/appveyor/create_cache.sh b/appveyor/create_cache.sh deleted file mode 100644 index 9c1c13398..000000000 --- a/appveyor/create_cache.sh +++ /dev/null @@ -1,11 +0,0 @@ - -set -e - -ARCHIVE_NAME="deps_windows_windows.zip" -SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key - -7z a -tzip $ARCHIVE_NAME $MINGW64_EXTRA_DIR -scp -P 30022 -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ - ${ARCHIVE_NAME} \ - ci@tmp.kiwix.org:/data/tmp/ci - diff --git a/appveyor/deploy.sh b/appveyor/deploy.sh deleted file mode 100755 index a8a9a64e9..000000000 --- a/appveyor/deploy.sh +++ /dev/null @@ -1,21 +0,0 @@ -set -e - -NIGHTLY_DATE=$(date +%Y-%m-%d) -NIGHTLY_KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} -RELEASE_KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES -SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key - -if [[ "$APPVEYOR_SCHEDULED_BUILD" = "True" ]] -then - scp -P 30022 -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ - ${NIGHTLY_KIWIX_ARCHIVES_DIR} \ - ci@master.download.kiwix.org:/data/download/nightly -fi - -if [[ "$APPVEYOR_REPO_TAG" = "true" ]] -then - RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f) - scp -P 30022 -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ - ${RELEASE_ARCHIVES} \ - ci@master.download.kiwix.org:/data/download/release/kiwix-desktop -fi diff --git a/appveyor/fix_desktop_makefile.py b/appveyor/fix_desktop_makefile.py deleted file mode 100644 index 509abbd0a..000000000 --- a/appveyor/fix_desktop_makefile.py +++ /dev/null @@ -1,29 +0,0 @@ -import re, sys, os - -makefile = sys.argv[-1] -print("Patching '{}'".format(makefile)) - -with open(makefile, 'r') as f: - lines = f.readlines() - -with open(makefile, 'w') as f: - for line in lines: -# if "/SUBSYSTEM:WINDOWS" in line: -# line = line.replace("/SUBSYSTEM:WINDOWS", "/SUBSYSTEM:CONSOLE") -# f.write(line) -# continue - if not line.startswith('LIBS '): - f.write(line) - continue - print("-- INPUT : {}".format(line)) - for lib in ('kiwix', 'zim', 'pugixml', 'z', 'zstd'): - line = line.replace('{}.lib'.format(lib), 'lib{}.a'.format(lib)) - for lib in ('lzma', 'curl'): - line = line.replace('lib{}.lib'.format(lib), 'lib{}.a'.format(lib)) - line = line.strip() -# line += " pthreadVC2.lib" -# line += " icuin.lib icudt.lib icuuc.lib" - line += " Rpcrt4.lib Ws2_32.lib winmm.lib Shlwapi.lib" - line += os.linesep - print("++ OUTPUT : {}".format(line)) - f.write(line) diff --git a/appveyor/install_aria2.cmd b/appveyor/install_aria2.cmd deleted file mode 100644 index 8517c1caf..000000000 --- a/appveyor/install_aria2.cmd +++ /dev/null @@ -1,4 +0,0 @@ -REM ======================================================== -REM Install aria2 -curl -fsSL -O https://github.com/aria2/aria2/releases/download/release-1.36.0/aria2-1.36.0-win-64bit-build1.zip || exit /b 1 -7z e aria2-1.36.0-win-64bit-build1.zip -o%EXTRA_DIR% aria2-1.36.0-win-64bit-build1\aria2c.exe || exit /b 1 diff --git a/appveyor/install_dirent.cmd b/appveyor/install_dirent.cmd deleted file mode 100644 index ed5b17e09..000000000 --- a/appveyor/install_dirent.cmd +++ /dev/null @@ -1,3 +0,0 @@ -REM ======================================================== -REM Install dirent.h -curl -fsSL -o%EXTRA_DIR%\include\dirent.h https://raw.githubusercontent.com/tronkko/dirent/master/include/dirent.h || exit /b 1 diff --git a/appveyor/install_git_ninja_pkgconfig.cmd b/appveyor/install_git_ninja_pkgconfig.cmd deleted file mode 100644 index ecaf70286..000000000 --- a/appveyor/install_git_ninja_pkgconfig.cmd +++ /dev/null @@ -1,14 +0,0 @@ -REM Set VC 2017 -"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" -mkdir C:\extra\bin -cd C:\projects -C:\Python36\Scripts\pip install meson || exit /b 1 - -REM Set ninja -curl -fsSL -o ninja-win.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip || exit /b 1 -7z e ninja-win.zip -o%EXTRA_DIR%\bin || exit /b 1 - -REM Set pkg-config-lit -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/appveyor/install_icu.cmd b/appveyor/install_icu.cmd deleted file mode 100644 index e681e55d7..000000000 --- a/appveyor/install_icu.cmd +++ /dev/null @@ -1,7 +0,0 @@ -REM ======================================================== -REM Install icu -curl -SL -O http://public.kymeria.fr/KIWIX/windows/icu4c-62_1-Win64-MSVC2017.zip || exit /b 1 -7z x icu4c-62_1-Win64-MSVC2017.zip -o%EXTRA_DIR% -r include || exit /b 1 -7z e icu4c-62_1-Win64-MSVC2017.zip -o%EXTRA_DIR%\lib lib64\* || exit /b 1 -7z e icu4c-62_1-Win64-MSVC2017.zip -o%EXTRA_DIR%\bin bin64\*.dll || exit /b 1 -curl -fsSL -o%PKG_CONFIG_PATH%\icu-i18n.pc http://public.kymeria.fr/KIWIX/windows/icu-i18n.pc || exit /b 1 diff --git a/appveyor/install_kiwix-desktop.cmd b/appveyor/install_kiwix-desktop.cmd deleted file mode 100644 index 4a331f9a3..000000000 --- a/appveyor/install_kiwix-desktop.cmd +++ /dev/null @@ -1,22 +0,0 @@ -REM ======================================================== -REM Install kiwix-desktop -git clone https://github.com/kiwix/kiwix-desktop || exit /b 1 -cd kiwix-desktop -echo "Running qmake" -SET _WITH_CONSOLE=1 -IF %KIWIX_DESKTOP_RELEASE% EQU 1 ( - IF %APPVEYOR_REPO_TAG% == true ( - SET _WITH_CONSOLE=0 - ) -) -IF %_WITH_CONSOLE% EQU 1 ( - C:\Qt\5.15\msvc2019_64\bin\qmake.exe "CONFIG+=static console" || exit /b 1 -) else ( - C:\Qt\5.15\msvc2019_64\bin\qmake.exe "CONFIG+=static" || exit /b 1 -) - -echo "Running fix_desktop" -C:\Python312\Python ..\appveyor\fix_desktop_makefile.py Makefile.Release || exit /b 1 -echo "Running nmake" -nmake || exit /b 1 -cd .. diff --git a/appveyor/install_libcurl.cmd b/appveyor/install_libcurl.cmd deleted file mode 100644 index 91f885452..000000000 --- a/appveyor/install_libcurl.cmd +++ /dev/null @@ -1,14 +0,0 @@ -REM ======================================================== -REM Install libcurl -curl -fsSL -O https://curl.haxx.se/download/curl-7.61.1.zip || exit /b 1 -7z x curl-7.61.1.zip || exit /b 1 -cd curl-7.61.1\winbuild -nmake /f Makefile.vc mode=static MACHINE=x64 DEBUG=no VC=15 ENABLE_IDN=no || exit /b 1 -mkdir %EXTRA_DIR%\include\curl -copy ..\builds\libcurl-vc15-x64-release-static-ipv6-sspi-winssl\include\curl\*.h %EXTRA_DIR%\include\curl -copy ..\builds\libcurl-vc15-x64-release-static-ipv6-sspi-winssl\lib\libcurl_a.lib %EXTRA_DIR%\lib -move %EXTRA_DIR%\lib\libcurl_a.lib %EXTRA_DIR%\lib\libcurl.a -dir %EXTRA_DIR%\include\curl -dir %EXTRA_DIR%\lib -curl -fsSl -o%PKG_CONFIG_PATH%\libcurl.pc http://public.kymeria.fr/KIWIX/windows/libcurl.pc || exit /b 1 -cd ..\.. diff --git a/appveyor/install_libkiwix.cmd b/appveyor/install_libkiwix.cmd deleted file mode 100644 index dc357e7c5..000000000 --- a/appveyor/install_libkiwix.cmd +++ /dev/null @@ -1,10 +0,0 @@ -REM ======================================================== -REM Install libkiwix -git clone https://github.com/kiwix/libkiwix.git || exit /b 1 -cd libkiwix -set CPPFLAGS="-I%EXTRA_DIR%/include" -meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 -cd build -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\.. diff --git a/appveyor/install_libmicrohttpd.cmd b/appveyor/install_libmicrohttpd.cmd deleted file mode 100644 index 4e4d6a529..000000000 --- a/appveyor/install_libmicrohttpd.cmd +++ /dev/null @@ -1,11 +0,0 @@ -REM ======================================================== -REM Install libmicrohttpd -curl -fsSL -O https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest-w32-bin.zip || exit /b 1 -7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/include libmicrohttpd-*-w32-bin/x86_64/VS2019/Release-static/microhttpd.h || exit /b 1 -7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/lib libmicrohttpd-*-w32-bin/x86_64/VS2019/Release-static/libmicrohttpd.lib || exit /b 1 -7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/lib/pkgconfig libmicrohttpd-*-w32-bin/x86_64/MinGW/static/mingw64/lib/pkgconfig/* || exit /b 1 - -rename %EXTRA_DIR%\lib\libmicrohttpd.lib microhttpd.lib -dir %EXTRA_DIR% -dir %EXTRA_DIR%\lib -dir %EXTRA_DIR%\lib\pkgconfig diff --git a/appveyor/install_libzim.cmd b/appveyor/install_libzim.cmd deleted file mode 100644 index 18e42d6d7..000000000 --- a/appveyor/install_libzim.cmd +++ /dev/null @@ -1,9 +0,0 @@ -REM ======================================================== -REM Install libzim -git clone https://github.com/openzim/libzim.git || exit /b 1 -cd libzim -meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 -cd build -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\.. diff --git a/appveyor/install_lzma.cmd b/appveyor/install_lzma.cmd deleted file mode 100644 index 48f4d0a7f..000000000 --- a/appveyor/install_lzma.cmd +++ /dev/null @@ -1,6 +0,0 @@ -REM ======================================================== -REM Install lzma -curl -fsSL -O https://tukaani.org/xz/xz-5.2.4-windows.zip || exit /b 1 -7z x xz-5.2.4-windows.zip -o%EXTRA_DIR% -r include || exit /b 1 -7z e xz-5.2.4-windows.zip -o%EXTRA_DIR%\lib bin_x86-64\liblzma.a || exit /b 1 -curl -fsSL -o%PKG_CONFIG_PATH%\liblzma.pc http://public.kymeria.fr/KIWIX/windows/liblzma.pc || exit /b 1 diff --git a/appveyor/install_mustache.cmd b/appveyor/install_mustache.cmd deleted file mode 100644 index 59b2b3014..000000000 --- a/appveyor/install_mustache.cmd +++ /dev/null @@ -1,3 +0,0 @@ -REM ======================================================== -REM Install mustache.hpp -curl -fsSL -o%EXTRA_DIR%\include\mustache.hpp https://raw.githubusercontent.com/kainjow/mustache/v3.2.1/mustache.hpp || exit /b 1 diff --git a/appveyor/install_pthread.cmd b/appveyor/install_pthread.cmd deleted file mode 100644 index d17e5a515..000000000 --- a/appveyor/install_pthread.cmd +++ /dev/null @@ -1,14 +0,0 @@ -REM ======================================================== -REM Install pthread -curl -fsSL -O ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip || exit /b 1 -7z x pthreads-w32-2-9-1-release.zip -r pthreads.2 || exit /b 1 -cd pthreads.2 -REM Patch is pthread_timespec.patch -curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/pthread.h || exit /b 1 -nmake clean VC-inlined || exit /b 1 -copy pthread.h %EXTRA_DIR%\include -copy sched.h %EXTRA_DIR%\include -copy pthreadVC2.lib %EXTRA_DIR%\lib -copy pthreadVC2.dll %EXTRA_DIR%\bin -curl -fsSL -o%PKG_CONFIG_PATH%\libpthreadVC2.pc http://public.kymeria.fr/KIWIX/windows/libpthreadVC2.pc || exit /b 1 -cd .. diff --git a/appveyor/install_pugixml.cmd b/appveyor/install_pugixml.cmd deleted file mode 100644 index e005d91c5..000000000 --- a/appveyor/install_pugixml.cmd +++ /dev/null @@ -1,10 +0,0 @@ -REM ======================================================== -REM Install pugixml -curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/pugixml-1.2-meson.zip || exit /b 1 -7z x pugixml-1.2-meson.zip -o. || exit /b 1 -cd pugixml-1.2-meson -meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 -cd build -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\.. diff --git a/appveyor/install_xapian.cmd b/appveyor/install_xapian.cmd deleted file mode 100644 index b0b448aee..000000000 --- a/appveyor/install_xapian.cmd +++ /dev/null @@ -1,9 +0,0 @@ -REM ======================================================== -REM Install xapian -curl -fsSL -O http://mirror.download.kiwix.org/dev/kiwix-build/xapian-core-1.4.18.zip || exit /b 1 -7z x xapian-core-1.4.18.zip || exit /b 1 -cd xapian-core-1.4.18 -mkdir build -cd build -%MINGW64_RUN% "cd /c/Projects/kiwix-build/xapian-core-1.4.18/build && /c/Projects/kiwix-build/appveyor/build_xapian.sh" > build_xapian.log || exit /b 1 -cd ..\.. diff --git a/appveyor/install_zlib.cmd b/appveyor/install_zlib.cmd deleted file mode 100644 index fd14aaab8..000000000 --- a/appveyor/install_zlib.cmd +++ /dev/null @@ -1,10 +0,0 @@ -REM ======================================================== -REM Install zlib -curl -fsSL -O http://mirror.download.kiwix.org/dev/kiwix-build/zlib-1.2.12.meson.zip || exit /b 1 -7z x zlib-1.2.12.meson.zip || exit /b 1 -cd zlib-1.2.12 -meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 -cd build -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\.. diff --git a/appveyor/install_zstd.cmd b/appveyor/install_zstd.cmd deleted file mode 100644 index 3339cbcda..000000000 --- a/appveyor/install_zstd.cmd +++ /dev/null @@ -1,10 +0,0 @@ -REM ======================================================== -REM Install zstd -curl -fsSL -o zstd-v1.5.2.zip https://github.com/facebook/zstd/archive/refs/tags/v1.5.2.zip || exit /b 1 -7z x zstd-v1.5.2.zip || exit /b 1 -cd zstd-1.5.2/build/meson -meson . builddir --prefix %EXTRA_DIR% --default-library static --buildtype release -Dbin_programs=false -Dbin_contrib=false || exit /b 1 -cd builddir -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\..\..\.. diff --git a/appveyor/kiwix.pfx.enc b/appveyor/kiwix.pfx.enc deleted file mode 100644 index 4ab45d5d5b754dc9791638d2f4c9f15bd6e9eac5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5424 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 diff --git a/appveyor/nightlybot_id_key.enc b/appveyor/nightlybot_id_key.enc deleted file mode 100644 index ad85d7bd0dae34bcdf1d251c7e66fe43d95ce5f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3264 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 diff --git a/appveyor/package_kiwix-desktop.sh b/appveyor/package_kiwix-desktop.sh deleted file mode 100644 index e26f1973c..000000000 --- a/appveyor/package_kiwix-desktop.sh +++ /dev/null @@ -1,35 +0,0 @@ - -set -e - -if [[ "$APPVEYOR_REPO_TAG" = "false" ]] -then - NIGHTLY_DATE=$(date +%Y-%m-%d) - KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} - KIWIX_DIR=kiwix-desktop_windows_x64_$NIGHTLY_DATE -else - if [ $KIWIX_DESKTOP_RELEASE -eq 1 ] - then - KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES - KIWIX_DIR=kiwix-desktop_windows_x64_${KIWIX_DESKTOP_VERSION} - fi -fi - -if [[ "$KIWIX_DIR" ]] -then - KIWIX_ARCH_NAME=${KIWIX_DIR}.zip - - mkdir $KIWIX_DIR - mkdir -p KIWIX_ARCHIVES_DIR - - cp /c/projects/kiwix-build/kiwix-desktop/Release/kiwix-desktop.exe $KIWIX_DIR -/c/Qt/5.15/msvc2019_64/bin/windeployqt --compiler-runtime $KIWIX_DIR - - cp $MINGW64_EXTRA_DIR/aria2c.exe $KIWIX_DIR - cp $MINGW64_EXTRA_DIR/bin/*.dll $KIWIX_DIR - cp /c/OpenSSL-v111-Win64/bin/libcrypto-1_1-x64.dll $KIWIX_DIR - cp /c/OpenSSL-v111-Win64/bin/libssl-1_1-x64.dll $KIWIX_DIR - - signtool.exe sign -f appveyor/kiwix.pfx -p $win_certificate_password -t http://timestamp.digicert.com -d "Kiwix-desktop application" -fd SHA256 $KIWIX_DIR/kiwix-desktop.exe - - 7z a -tzip $KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR -fi diff --git a/appveyor/setup_from_cache.cmd b/appveyor/setup_from_cache.cmd deleted file mode 100644 index ced71b6c4..000000000 --- a/appveyor/setup_from_cache.cmd +++ /dev/null @@ -1,4 +0,0 @@ -REM ======================================================== -REM Setup from cache -curl -fsSL -O http://tmp.kiwix.org/ci/deps_windows_windows.zip || exit /b 1 -7z x deps_windows_windows.zip -oc: -aoa || exit /b 1 diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index a1d41932b..87124d141 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -5,7 +5,7 @@ "libkiwix": "13.1.0", "kiwix-tools": "3.7.0", "zim-tools": "3.4.2", - "kiwix-desktop": "2.3.1", # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml + "kiwix-desktop": "2.3.1", } # This dictionnary specify what we need to build at each release process. @@ -22,12 +22,6 @@ # `(was ...)`. # - Else, increment the value. If no value was present, see `(was ...)`. -# For kiwix-desktop, if this is not None: -# - set KIWIX_DESKTOP_RELEASE to 1 -# - set KIWIX_DESKTOP_VERSION to the version of the release (including release_versions) -# If this is None: -# - set KIWIX_DESKTOP_RELEASE to 0 - release_versions = { "libzim": 1, # Depends of base deps (was 0) "libkiwix": None, # Depends of libzim (was 4)