FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not offer devbuild as new version.

Browse Source
This commit is contained in:
Martin Rotter 2020-12-10 07:31:07 +01:00
parent 41e87e86b3
commit dd7eab318c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/scripts/github-actions/build-linux-mac.sh
View File

@ -43,10 +43,10 @@ else
export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins" export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins"
export PATH="$QTBIN:$PATH" export PATH="$QTBIN:$PATH"
qmake --version
fi fi
qmake --version
# Build application and package it. # Build application and package it.
git_tag=$(git describe --tags `git rev-list --tags --max-count=1`) git_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
git_revision=$(git rev-parse --short HEAD) git_revision=$(git rev-parse --short HEAD)

7
src/librssguard/miscellaneous/systemfactory.cpp
View File

@ -291,10 +291,15 @@ QList<UpdateInfo> SystemFactory::parseUpdatesFile(const QByteArray& updates_file
for (QJsonValueRef i : document) { for (QJsonValueRef i : document) {
QJsonObject release = i.toObject(); QJsonObject release = i.toObject();
if (release["tag_name"].toString() == QSL("devbuild")) {
continue;
}
UpdateInfo update; UpdateInfo update;
update.m_date = QDateTime::fromString(release["published_at"].toString(), QSL("yyyy-MM-ddTHH:mm:ssZ"));
update.m_availableVersion = release["tag_name"].toString(); update.m_availableVersion = release["tag_name"].toString();
update.m_date = QDateTime::fromString(release["published_at"].toString(), QSL("yyyy-MM-ddTHH:mm:ssZ"));
update.m_changes = release["body"].toString(); update.m_changes = release["body"].toString();
QJsonArray assets = release["assets"].toArray(); QJsonArray assets = release["assets"].toArray();