smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix publication of release kiwix-desktop on windows.

This commit is contained in:
Matthieu Gautier 2019-03-19 11:24:20 +01:00
parent 74210ece52
commit da30e11f6a
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
appveyor/deploy.sh
View File

@ -2,11 +2,20 @@ set -e
NIGHTLY_DATE=$(date +%Y-%m-%d) NIGHTLY_DATE=$(date +%Y-%m-%d)
NIGHTLY_KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} 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 SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key
#if [[ "$APPVEYOR_SCHEDULED_BUILD" = "True" ]] if [[ "$APPVEYOR_SCHEDULED_BUILD" = "True" ]]
#then then
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
${NIGHTLY_KIWIX_ARCHIVES_DIR} \ ${NIGHTLY_KIWIX_ARCHIVES_DIR} \
ci@download.kiwix.org:/data/download/nightly ci@download.kiwix.org:/data/download/nightly
#fi fi
if [[ "$APPVEYOR_REPO_TAG" = "true" ]]
then
RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f)
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
${RELEASE_ARCHIVES} \
ci@download.kiwix.org:/data/download/release/kiwix-desktop
fi

20
appveyor/package_kiwix-desktop.sh
View File

@ -1,13 +1,21 @@
set -e set -e
NIGHTLY_DATE=$(date +%Y-%m-%d) if [[ "$APPVEYOR_REPO_TAG" = "false" ]]
NIGHTLY_KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} then
KIWIX_ARCH_NAME=kiwix-desktop_$NIGHTLY_DATE.zip NIGHTLY_DATE=$(date +%Y-%m-%d)
KIWIX_DIR=kiwix-desktop_$NIGHTLY_DATE KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE}
KIWIX_DIR=kiwix-desktop_windows_x64_$NIGHTLY_DATE
else
KIWIX_DESKTOP_VERSION=2.0-beta3
KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES
KIWIX_DIR=kiwix-desktop_windows_x64_${KIWIX_DESKTOP_VERSION}
fi
KIWIX_ARCH_NAME=${KIWIX_DIR}.zip
mkdir $KIWIX_DIR mkdir $KIWIX_DIR
mkdir -p NIGHTLY_KIWIX_ARCHIVES_DIR mkdir -p KIWIX_ARCHIVES_DIR
cp /c/projects/kiwix-build/kiwix-desktop/Release/kiwix-desktop.exe $KIWIX_DIR cp /c/projects/kiwix-build/kiwix-desktop/Release/kiwix-desktop.exe $KIWIX_DIR
/c/Qt/5.11/msvc2017_64/bin/windeployqt --compiler-runtime $KIWIX_DIR /c/Qt/5.11/msvc2017_64/bin/windeployqt --compiler-runtime $KIWIX_DIR
@ -17,4 +25,4 @@ cp $MINGW64_EXTRA_DIR/bin/*.dll $KIWIX_DIR
/c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/x64/signtool.exe sign -f appveyor/kiwix.pfx -p $win_certificate_password -t http://timestamp.verisign.com/scripts/timestamp.dll -d "Kiwix-desktop application" $KIWIX_DIR/kiwix-desktop.exe /c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/x64/signtool.exe sign -f appveyor/kiwix.pfx -p $win_certificate_password -t http://timestamp.verisign.com/scripts/timestamp.dll -d "Kiwix-desktop application" $KIWIX_DIR/kiwix-desktop.exe
7z a -tzip $NIGHTLY_KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR 7z a -tzip $KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR

2
kiwixbuild/versions.py
View File

@ -6,7 +6,7 @@ main_project_versions = {
'libzim': '4.0.5', 'libzim': '4.0.5',
'zim-tools': '1.0.0', 'zim-tools': '1.0.0',
'zimwriterfs': '1.2', 'zimwriterfs': '1.2',
'kiwix-desktop': '2.0-beta3' 'kiwix-desktop': '2.0-beta3' # Also need to be change in appveyor/package_kiwix-desktop.sh
} }
# This dictionnary specify what we need to build at each release process. # This dictionnary specify what we need to build at each release process.