diff options
| -rw-r--r-- | .ci/bintray-release.json | 37 | ||||
| -rwxr-xr-x | .ci/linux/deploy.sh | 11 | ||||
| -rwxr-xr-x | .ci/macos/deploy.sh | 4 | ||||
| -rw-r--r-- | .travis.yml | 28 | ||||
| -rw-r--r-- | appveyor.yml | 29 | ||||
| -rw-r--r-- | src/ChatPage.cc | 16 |
6 files changed, 83 insertions, 42 deletions
diff --git a/.ci/bintray-release.json b/.ci/bintray-release.json new file mode 100644 index 00000000..7115c910 --- /dev/null +++ b/.ci/bintray-release.json @@ -0,0 +1,37 @@ +{ + "files": [ + { + "includePattern": "nheko-VERSION_NAME_VALUE.dmg", + "matrixParams": { + "override": 1 + }, + "uploadPattern": "VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE.dmg" + }, + { + "includePattern": "nheko-VERSION_NAME_VALUE-x86_64.AppImage", + "matrixParams": { + "override": 1 + }, + "uploadPattern": "VERSION_NAME_VALUE/nheko-VERSION_NAME_VALUE-x86_64.AppImage" + } + ], + "package": { + "desc": "Desktop client for the Matrix protocol", + "issue_tracker_url": "https://github.com/mujx/nheko/issues", + "licenses": [ + "GPL-3.0" + ], + "name": "nheko", + "public_download_numbers": true, + "public_stats": true, + "repo": "matrix", + "subject": "mujx", + "vcs_url": "https://github.com/mujx/nheko", + "website_url": "https://github.com/mujx/nheko" + }, + "publish": true, + "version": { + "name": "VERSION_NAME_VALUE", + "vcs_tag": "VERSION_NAME_VALUE" + } +} diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh index 77a4fa06..39fb0e30 100755 --- a/.ci/linux/deploy.sh +++ b/.ci/linux/deploy.sh @@ -7,7 +7,7 @@ DIR=${APP}.AppDir TAG=`git tag -l --points-at HEAD` # Set up AppImage structure. -mkdir -p ${DIR}/usr/{bin,share/pixmaps,share/applications} +mkdir -p ${DIR}/usr/{bin,lib,share/pixmaps,share/applications} # Copy resources. cp build/nheko ${DIR}/usr/bin @@ -30,9 +30,16 @@ unset QTDIR unset QT_PLUGIN_PATH unset LD_LIBRARY_PATH +cp -R .deps/usr/lib/* ${DIR}/usr/lib + +ldd ${DIR}/usr/bin/nheko + ./linuxdeployqt*.AppImage \ ${DIR}/usr/share/applications/nheko.desktop \ - -bundle-non-qt-libs\ -appimage chmod +x nheko-x86_64.AppImage + +if [ ! -z $TRAVIS_TAG ]; then + mv nheko-x86_64.AppImage nheko-${TRAVIS_TAG}-x86_64.AppImage +fi diff --git a/.ci/macos/deploy.sh b/.ci/macos/deploy.sh index 133c7b0e..1de95a44 100755 --- a/.ci/macos/deploy.sh +++ b/.ci/macos/deploy.sh @@ -15,3 +15,7 @@ mv nheko.dmg .. popd dmgbuild -s ./.ci/macos/settings.json "Nheko" nheko.dmg + +if [ ! -z $TRAVIS_TAG ]; then + mv nheko.dmg nheko-${TRAVIS_TAG}.dmg +fi diff --git a/.travis.yml b/.travis.yml index 3e631f30..690f6690 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,28 +66,18 @@ install: script: - ./.ci/script.sh + - sed -i -e "s/VERSION_NAME_VALUE/${TRAVIS_TAG}/g" ./.ci/bintray-release.json || true + - cp ./.ci/bintray-release.json . deploy: - - skip_cleanup: true + - provider: bintray + user: "mujx" + key: + secure: "CAVzWZPxYSOTollo9bpD4tvEbfxXjqelc32aApV48GKyJrMQljQ+mvSe25BuUtnDehxnw8affgGX23AYXmvG8P7w4hM2d7//8Lgan1zCmusV8JE432jknev6X641B4cvrywqSe0Dj3l0kS9Xgirq4BGavlI0y2vUjeJfQEv0y8GYoI72LwgyH0i82v/1Qi92Fh8429IJIb0eKmC1wGWXCmo2kd8StZRL5mSlc4TmyWI0SHpA5GrLMiQwLAuD7DjDl5mpaK2yQx+H4vBcI2SUMvmlHGgVjXikJG5gURlHbnIaaBFvO67INc1/65KtMokWuMP12zxqJiaMPtsAskOpQv4FLAYDfnigH3NxufyOIGp2cxS5RhJDQhbNsxHEDnUo1kHcO23ZYNWCuC1yUdn0RXzKhWcUsz8mKF8KJs22Ty4VjfUMZ+vqK/AbHyq4rkl8DizVRZqKF1KjSWrSv/2sT4itnHk9pmcgxAYfGuALcjrJJveI4MTwDhzXB62CKnMOqLq3sAMqvE0+BdA0BykQr7qrKtptuyP2/OFx6RDbfHQl5Klkb6cSOjxm0oUzh/8iaxgsVdCrhfE67eqkhFZ+a8lJkB/rZ4zSK1Q2Cp4nLtnxenUCW+Ptk2l7zZN6kXM1/+tcgqVROChYJ6asMUpsjFOOAVQ8SZ4TcxX1rq+pxlA=" + skip_cleanup: true overwrite: true - provider: releases - api_key: - secure: oprXzESukFiXBeF2BXkXUlegsAQc95Ub4kc/OkoNFaYBvqpA+IGpWHmHCx5JPny/OT3Kc2Urpe2JUeGSWDHZ7UCKDjH+NzGP3uN82fHh/HiszG/Srw7+hWEHm1ve+gMK9GS8pr+yUsUrPP0UfVXlPoI4pBWa4zGi2Ndb/SqvjCgIHFLtGyoBo6CydKQ/AyWiXSMKDfJL+Dx4JLIPP4RTCBJy8ZrZ8m/a5Tgy4Ij6+djjrgYCZCEhGxSYw7xDIT/9SV8g9NkrbisqBDrILzAH8Yhe4XMRMXo88OAxV5+Vb9Rw1hrqczez6lpFDbJetv8MjofND+pSoAFwtjaL1wTFK9Ud6w4O9AuHlEQH9cGVdvsxFcosRwJVh58x51JM9ptoktqhx/HHJBTuCHCYYlHwtRwbwqnMYdLzKZG5FnujT8DG+9mcva1fL6tzW/XD505VPMWwXFC/2/pvolgAkTFFXYSALAwZlK3IgoXU8Gok/3B4iHofzQsFf6Yq3BI/88x7tVASUqiYhoKrO50+gb6pNIRCyWgGUiBEVXBp6Ziq3ORQPyQJg7i9HHUGTUu74yvGLHWLwjNQzZP/hxJZK3VlJxzyXntdOxiJc8iOzNrU+rPKBAlAaE6bQDOoniIysEgdD5BXHTLFzPvts4P1n2Ckor5/rNJ+qXR8GU+/y7e1GKU= - file_glob: true - file: - - nheko-x86_64.AppImage + file: "bintray-release.json" on: - condition: $TRAVIS_OS_NAME == linux && $DEPLOYMENT == 1 - repo: mujx/nheko - tags: true - - - skip_cleanup: true - overwrite: true - provider: releases - api_key: - secure: oprXzESukFiXBeF2BXkXUlegsAQc95Ub4kc/OkoNFaYBvqpA+IGpWHmHCx5JPny/OT3Kc2Urpe2JUeGSWDHZ7UCKDjH+NzGP3uN82fHh/HiszG/Srw7+hWEHm1ve+gMK9GS8pr+yUsUrPP0UfVXlPoI4pBWa4zGi2Ndb/SqvjCgIHFLtGyoBo6CydKQ/AyWiXSMKDfJL+Dx4JLIPP4RTCBJy8ZrZ8m/a5Tgy4Ij6+djjrgYCZCEhGxSYw7xDIT/9SV8g9NkrbisqBDrILzAH8Yhe4XMRMXo88OAxV5+Vb9Rw1hrqczez6lpFDbJetv8MjofND+pSoAFwtjaL1wTFK9Ud6w4O9AuHlEQH9cGVdvsxFcosRwJVh58x51JM9ptoktqhx/HHJBTuCHCYYlHwtRwbwqnMYdLzKZG5FnujT8DG+9mcva1fL6tzW/XD505VPMWwXFC/2/pvolgAkTFFXYSALAwZlK3IgoXU8Gok/3B4iHofzQsFf6Yq3BI/88x7tVASUqiYhoKrO50+gb6pNIRCyWgGUiBEVXBp6Ziq3ORQPyQJg7i9HHUGTUu74yvGLHWLwjNQzZP/hxJZK3VlJxzyXntdOxiJc8iOzNrU+rPKBAlAaE6bQDOoniIysEgdD5BXHTLFzPvts4P1n2Ckor5/rNJ+qXR8GU+/y7e1GKU= - file: nheko.dmg - on: - condition: $TRAVIS_OS_NAME == osx && $DEPLOYMENT == 1 + condition: $DEPLOYMENT == 1 repo: mujx/nheko tags: true diff --git a/appveyor.yml b/appveyor.yml index dfd637ed..48c7e5cc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -67,12 +67,9 @@ after_build: - copy build\Release\nheko.exe NhekoRelease\nheko.exe - windeployqt --qmldir %QT_DIR%\qml\ --release NhekoRelease\nheko.exe - - copy C:\Tools\vcpkg\installed\x64-windows\lib\lmdb.lib .\NhekoRelease\lmdb.lib - - copy C:\Tools\vcpkg\installed\x64-windows\bin\lmdb.dll .\NhekoRelease\lmdb.dll + - copy C:\Tools\vcpkg\installed\x64-windows\lib\*.lib .\NhekoRelease\ + - copy C:\Tools\vcpkg\installed\x64-windows\bin\*.dll .\NhekoRelease\ - - copy C:\OpenSSL-Win64\bin\ssleay32.dll .\NhekoRelease\ssleay32.dll - - copy C:\OpenSSL-Win64\bin\libeay32.dll .\NhekoRelease\libeay32.dll - - copy C:\OpenSSL-Win64\lib\libeay32.lib .\NhekoRelease\libeay32.lib - 7z a nheko_win_64.zip .\NhekoRelease\* - ls -lh build\Release\ - ls -lh NhekoRelease\ @@ -115,17 +112,23 @@ after_build: - set PATH=%BUILD%\tools\bin;%PATH% - binarycreator.exe -f -c installer\config\config.xml -p installer\packages nheko-installer.exe + - mv nheko-installer.exe nheko-%APPVEYOR_REPO_TAG_NAME%-installer.exe + deploy: - description: "Development builds" - provider: GitHub - auth_token: - secure: YqB7hcM+4482eSHhtVR7ZA7N7lE78y8BC897/7UDTBQd+NWdWFW/6S+oKDie9TT7 - artifact: nheko-installer.exe - force_update: true - prerelease: true + provider: BinTray + username: mujx + api_key: + secure: "hhhAH6csIrPEVH92NNQkiGCkuON6l6sfhbZk+pvzDAM3vHex7YbqFKW6v5UjAS8v" + subject: mujx + repo: matrix + package: nheko + version: $(APPVEYOR_REPO_TAG_NAME) + publish: true + override: true + artifact: nheko-$(APPVEYOR_REPO_TAG_NAME)-installer.exe on: appveyor_repo_tag: true artifacts: - path: nheko_win_64.zip - - path: nheko-installer.exe + - path: nheko-$(APPVEYOR_REPO_TAG_NAME)-installer.exe diff --git a/src/ChatPage.cc b/src/ChatPage.cc index cffb2a46..e543cdf9 100644 --- a/src/ChatPage.cc +++ b/src/ChatPage.cc @@ -1084,7 +1084,7 @@ ChatPage::trySync() if (!http::v2::is_logged_in()) return; - emit dropToLoginPageCb(msg); + emit tryDelayedSyncCb(); return; } @@ -1095,16 +1095,16 @@ ChatPage::trySync() emit trySyncCb(); return; } - case 401: - case 403: { + default: { if (!http::v2::is_logged_in()) return; - emit dropToLoginPageCb(msg); - return; - } - default: { - emit tryDelayedSyncCb(); + if (err->matrix_error.errcode == + mtx::errors::ErrorCode::M_UNKNOWN_TOKEN) + emit dropToLoginPageCb(msg); + else + emit tryDelayedSyncCb(); + return; } } |