diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 00000000..8a9074f2 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,39 @@ +version: '{build}' +pull_requests: + do_not_increment_build_number: true +configuration: Release +branches: + except: + - /^(?i:continuous)$/ +skip_tags: true +environment: + matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + QT_PROFILE: msvc2015 + QTDIR: C:\Qt\5.10.1\msvc2015 + QBS_PROFILE: MSVC2015-x86 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + QT_PROFILE: msvc2017_64 + QTDIR: C:\Qt\5.10.1\msvc2017_64 + QBS_PROFILE: MSVC2017-x86_x64 +init: +- set PATH=%QTDIR%\bin;%PATH% +install: +- choco install -y qbs --version 1.11.0 +before_build: +- qbs setup-toolchains --detect +- qbs setup-qt %QTDIR%\bin\qmake.exe appveyor-qt5 +- qbs config profiles.appveyor-qt5.baseProfile %QBS_PROFILE% +- qbs config defaultProfile appveyor-qt5 +- qbs config preferences.qbsSearchPaths %cd%/fluid/qbs/shared +build_script: +- git submodule update --init --recursive +- qbs -d build --all-products config:release project.autotestEnabled:false project.useSystemQbsShared:false project.deploymentEnabled:false project.withDocumentation:false +- dir build\release\install-root +notifications: +- provider: Slack + incoming_webhook: https://hooks.slack.com/services/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 + channel: '#events' + on_build_success: true + on_build_failure: true + on_build_status_changed: true diff --git a/.gitattributes b/.gitattributes index f90a194d..a25c0c4e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,4 @@ .gitmodules export-ignore .travis export-ignore .travis.yml export-ignore +.mailmap export-ignore diff --git a/.travis/build.sh b/.travis/build.sh index a19e6fbb..b2407c1b 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -4,6 +4,12 @@ set -e source /usr/local/share/liri-travis/functions +# Install packages +travis_start "install_packages" +msg "Install packages..." +sudo apt-get install -y desktop-file-utils appstream-util +travis_end "install_packages" + # Configure qbs travis_start "qbs_setup" msg "Setup qbs..." @@ -26,3 +32,11 @@ qbs -d build -j $(nproc) --all-products profile:travis-qt5 \ projects.Fluid.useSystemQbsShared:false \ projects.Fluid.deploymentEnabled:true travis_end "build" + +# Validate desktop file and appdata +for filename in $(find . -type f -name "*.desktop"); do + desktop-file-validate $filename +done +for filename in $(find . -type f -name "*.appdata.xml"); do + appstream-util validate-relax --nonet $filename +done diff --git a/.travis/deploy.sh b/.travis/deploy.sh index 0ea38476..dadd22d4 100755 --- a/.travis/deploy.sh +++ b/.travis/deploy.sh @@ -43,5 +43,5 @@ openssl aes-256-cbc -K $encrypted_a841ddf051d0_key -iv $encrypted_a841ddf051d0_i chmod 600 /tmp/github_deploy_key_liri_ci eval "$(ssh-agent -s)" ssh-add /tmp/github_deploy_key_liri_ci -rsync -crvz --rsh="ssh" --delete-after --delete-excluded build/default/fluid-online-doc.*/qdoc_html/ $DEPLOY_USER@$DEPLOY_HOST:$TRAVIS_BRANCH +rsync -crvz --rsh="ssh" --delete-after --delete-excluded build/default/fluid-offline-doc.*/qdoc_html/ $DEPLOY_USER@$DEPLOY_HOST:$TRAVIS_BRANCH scp $filename $DEPLOY_USER@$DEPLOY_HOST:$TRAVIS_BRANCH/$destfilename diff --git a/README.md b/README.md index 2eb1c846..2bfd6d07 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ Fluid ===== -[![ZenHub.io](https://img.shields.io/badge/supercharged%20by-zenhub.io-blue.svg)](https://zenhub.io) - [![License](https://img.shields.io/badge/license-MPL2-blue.svg)](https://www.mozilla.org/en-US/MPL/2.0/) [![GitHub release](https://img.shields.io/github/release/lirios/fluid.svg)](https://github.com/lirios/fluid) [![Build Status](https://travis-ci.org/lirios/fluid.svg?branch=develop)](https://travis-ci.org/lirios/fluid) diff --git a/doc/doc.qbs b/doc/doc.qbs index b0426078..e4387911 100644 --- a/doc/doc.qbs +++ b/doc/doc.qbs @@ -11,7 +11,6 @@ Project { condition: project.withDocumentation && !qbs.targetOS.contains("android") references: [ - "online.qbs", "offline.qbs", ] } diff --git a/doc/fluid-online.qdocconf b/doc/fluid-online.qdocconf deleted file mode 100644 index 8331ca4f..00000000 --- a/doc/fluid-online.qdocconf +++ /dev/null @@ -1,67 +0,0 @@ -include(config/fluid-project.qdocconf) -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) - -HTML.nonavigationbar = "false" - -HTML.navigationseparator = "" - -HTML.stylesheets = \ - template/style/base.css \ - template/style/liri.css \ - template/style/liri.eot \ - template/style/liri.svg \ - template/style/liri.ttf \ - template/style/liri.woff - -HTML.headerstyles = \ - "\n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - "\n" \ - -HTML.headerscripts = \ - " \n" \ - -HTML.endheader = \ - "\n" - -HTML.postheader = \ - "\n" \ - "
\n" \ - "