From 5b7260e97d9c45662498600b22f700de0f119582 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 8 Dec 2020 15:05:28 +0100 Subject: [PATCH] Remove all travis/appveyor stuff, now dev. builds directly in RELEASES via github actions. --- .appveyor.yml | 50 --------------------- .travis-bintray-desc.json | 19 -------- .travis.yml | 42 ----------------- README.md | 4 +- resources/docs/Downloads.md | 4 +- resources/scripts/.appveyor-build-win.ps1 | 46 ------------------- resources/scripts/.travis-before-install.sh | 21 --------- resources/scripts/.travis-install-linux.sh | 43 ------------------ resources/scripts/.travis-install-osx.sh | 50 --------------------- 9 files changed, 3 insertions(+), 276 deletions(-) delete mode 100755 .appveyor.yml delete mode 100644 .travis-bintray-desc.json delete mode 100755 .travis.yml delete mode 100644 resources/scripts/.appveyor-build-win.ps1 delete mode 100755 resources/scripts/.travis-before-install.sh delete mode 100755 resources/scripts/.travis-install-linux.sh delete mode 100755 resources/scripts/.travis-install-osx.sh diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100755 index b7eefc4a3..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,50 +0,0 @@ -version: 666.{build} -skip_tags: false -os: Visual Studio 2019 -clone_depth: 1 -clone_folder: C:\rssguard - -environment: - QTVER: '5.14' - QTREV: '2' - QTDIR: 'C:\Qt\5.14.2\msvc2017_64' - QMAKESPEC: win32-msvc - access_token: - secure: oR2iY1h+Z5AF4t3yP1mxNW7HL8qhPm8y4Uupp4b03QSC7puVrkkCaO1E1NQA9q9K - matrix: - - qmake_args: 'USE_WEBENGINE=false' - - qmake_args: 'USE_WEBENGINE=true' - -artifacts: - - path: 'rssguard-build\src\rssguard\*win64.exe' - name: rssguardexe - - - path: 'rssguard-build\src\rssguard\*win64.7z' - name: rssguard7z - -deploy: - - provider: BinTray - username: martinrotter - api_key: - secure: T463Ei805xAQcxqvtTu7WDsfCmhqViVTdwzPQdyXVLovhTNLR3R5ZnPXMEuGCYJY - subject: martinrotter - repo: rssguard - package: Development - version: Windows - publish: true - override: true - explode: false - - provider: GitHub - description: 'release by appveyor' - auth_token: - secure: oR2iY1h+Z5AF4t3yP1mxNW7HL8qhPm8y4Uupp4b03QSC7puVrkkCaO1E1NQA9q9K - artifact: rssguardexe, rssguard7z - draft: false - prerelease: false - on: - appveyor_repo_tag: true - -build_script: - - git submodule update --init --recursive --remote - - '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"' - - ps: .\resources\scripts\.appveyor-build-win.ps1 diff --git a/.travis-bintray-desc.json b/.travis-bintray-desc.json deleted file mode 100644 index 98216ddc0..000000000 --- a/.travis-bintray-desc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "package": { - "name": "Development", - "repo": "rssguard", - "subject": "martinrotter", - "vcs_url": "https://github.com/martinrotter/rssguard", - "licenses": ["GPL3"] - }, - - "version": { - "name": "LinuxMacOs" - }, - - "files": - [ - {"includePattern": "\.\/rssguard-build\/src\/rssguard\/((rss|RSS).+(AppImage|dmg))", "excludePattern": ".*/do-not-deploy/.*", "uploadPattern": "$1"} - ], - "publish": true -} diff --git a/.travis.yml b/.travis.yml deleted file mode 100755 index 5f67e9e6f..000000000 --- a/.travis.yml +++ /dev/null @@ -1,42 +0,0 @@ -language: cpp -osx_image: xcode12 -dist: xenial -os: -- linux -- osx -env: -- USE_WEBENGINE=false -- USE_WEBENGINE=true -compiler: -- gcc -notifications: - email: false -deploy: - - provider: releases - skip_cleanup: true - file_glob: true - api_key: $GH_TOKEN - file: - - rssguard-build/src/rssguard/rss*.AppImage - - rssguard-build/src/rssguard/rss*.dmg - on: - tags: true - all_branches: true - - provider: bintray - skip_cleanup: true - file: .travis-bintray-desc.json - user: martinrotter - key: $BINTRAY_KEY - on: - all_branches: true - -git: - submodules: false - depth: 10 -before_install: "./resources/scripts/.travis-before-install.sh" -install: true -script: -- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./resources/scripts/.travis-install-linux.sh - ; fi -- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./resources/scripts/.travis-install-osx.sh - ; fi diff --git a/README.md b/README.md index 336c2b671..c52a5968c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ RSS Guard ========= -[![AppVeyor](https://img.shields.io/appveyor/ci/martinrotter/rssguard.svg?maxAge=360)](https://ci.appveyor.com/project/martinrotter/rssguard) -[![Travis CI](https://img.shields.io/travis/martinrotter/rssguard.svg?maxAge=360)](https://travis-ci.org/martinrotter/rssguard) [![Total downloads](https://img.shields.io/github/downloads/martinrotter/rssguard/total.svg?maxAge=360)](http://www.somsubhra.com/github-release-stats/?username=martinrotter&repository=rssguard&search=0) [![Version](https://img.shields.io/github/release/martinrotter/rssguard.svg?maxAge=360)](https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/text/CHANGELOG) [![Packaging status](https://repology.org/badge/tiny-repos/rssguard.svg)](https://repology.org/project/rssguard/versions) @@ -19,6 +17,6 @@ RSS Guard is simple, light and easy-to-use RSS/ATOM feed aggregator developed us Application icon was kindly contributed by Siddharth Yadav - @Siddharth_yd (Instagram), illustrationdesignsid@gmail.com (e-mail). -Development builds can be downloaded [here for Windows](https://bintray.com/martinrotter/rssguard/Development/Windows) and [here for Linux/Mac](https://bintray.com/martinrotter/rssguard/Development/LinuxMacOs). +Development builds can be downloaded [here](https://github.com/martinrotter/rssguard/releases/tag/devbuild). Documentation is [here](https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md). diff --git a/resources/docs/Downloads.md b/resources/docs/Downloads.md index 28aeb8e95..2f63370ef 100755 --- a/resources/docs/Downloads.md +++ b/resources/docs/Downloads.md @@ -9,7 +9,7 @@ Official downloads are available [here](https://github.com/martinrotter/rssguard ![RSS Guard is 100% clean.](http://www.softpedia.com/_img/softpedia_100_free.png) ## Development builds -Development builds can be downloaded [here for Windows](https://bintray.com/martinrotter/rssguard/Development/Windows) and [here for Linux or Mac OS](https://bintray.com/martinrotter/rssguard/Development/LinuxMacOs). +Development builds can be downloaded [here](https://github.com/martinrotter/rssguard/releases/tag/devbuild). ## Installation packages naming **Windows builds** of RSS Guard are generated automatically by the tool called AppVeyor. These builds have auto-generated names. In RSS Guard [downloads page](https://github.com/martinrotter/rssguard/releases) you can see filenames like: @@ -25,4 +25,4 @@ The structure of these filenames is quite trivial and easily understandable for * `` = `win32` (This is the target platform which the application can run on.), * `` = `exe` (This is self-explanatory.). -Note that same file naming scheme is used for auto-generated builds for Linux and Mac OS. \ No newline at end of file +Note that same file naming scheme for development builds might be little different. Specifically, `` field is omitted. \ No newline at end of file diff --git a/resources/scripts/.appveyor-build-win.ps1 b/resources/scripts/.appveyor-build-win.ps1 deleted file mode 100644 index 112bce710..000000000 --- a/resources/scripts/.appveyor-build-win.ps1 +++ /dev/null @@ -1,46 +0,0 @@ -$old_pwd = $pwd.Path - -# Get Qt. -$qt_version = "5.15.1" -$qt_stub = "qt-$qt_version-dynamic-msvc2019-x86_64" -$qt_link = "https://github.com/martinrotter/qt5-minimalistic-builds/releases/download/$qt_version/$qt_stub.7z" -$qt_output = "qt.7z" - -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -Invoke-WebRequest -Uri $qt_link -OutFile $qt_output -& ".\resources\scripts\7za\7za.exe" x $qt_output - -$qt_path = (Resolve-Path $qt_stub).Path -$qt_qmake = "$qt_path\bin\qmake.exe" - -cd "$qt_stub\bin\" -& ".\qtbinpatcher.exe" -cd "$old_pwd" - -$env:PATH = "$qt_path\bin\;" + $env:PATH - -# Build RSS Guard itself. -echo "qmake args are: '$env:qmake_args'." - -mkdir "rssguard-build" -cd "rssguard-build" -& "$qt_qmake" "..\build.pro" "-r" "$env:qmake_args" "CONFIG-=debug" "CONFIG-=debug_and_release" "CONFIG*=release" -nmake.exe - -cd "src\rssguard" -nmake.exe install - -cd "app" -windeployqt.exe --verbose 1 --compiler-runtime --no-translations --release rssguard.exe librssguard.dll - -cd ".." - -# Copy OpenSSL. -Copy-Item -Path "$qt_path\bin\libcrypto*.dll" -Destination ".\app\" -Copy-Item -Path "$qt_path\bin\libssl*.dll" -Destination ".\app\" - -# Copy MySQL Qt plugin. -Copy-Item -Path "$qt_path\bin\libmariadb.dll" -Destination ".\app\" - -nmake.exe windows_all -cd "$old_pwd" \ No newline at end of file diff --git a/resources/scripts/.travis-before-install.sh b/resources/scripts/.travis-before-install.sh deleted file mode 100755 index a93e3b568..000000000 --- a/resources/scripts/.travis-before-install.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -git fetch --tags - -if test "$TRAVIS_OS_NAME" = "osx"; then - # Mac OS X. - pip3 install aqtinstall -elif test "$TRAVIS_OS_NAME" = "linux"; then - # Linux. - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo add-apt-repository ppa:beineri/opt-qt-5.14.2-xenial -y - - sudo apt-get update - sudo apt-get -y install gcc-7 g++-7 qt514tools qt514base qt514webengine qt514svg - sudo apt-get -y install openssl libssl-dev libgl1-mesa-dev - - sudo update-alternatives --remove-all gcc - sudo update-alternatives --remove-all g++ - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 50 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 50 -fi \ No newline at end of file diff --git a/resources/scripts/.travis-install-linux.sh b/resources/scripts/.travis-install-linux.sh deleted file mode 100755 index 98e007968..000000000 --- a/resources/scripts/.travis-install-linux.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -source /opt/qt514/bin/qt514-env.sh - -# Build application. -mkdir rssguard-build && cd rssguard-build -qmake .. "USE_WEBENGINE=$USE_WEBENGINE" -make -make install -cd "src/rssguard" - -# Obtain linuxdeployqt. -wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage -chmod a+x linuxdeployqt-continuous-x86_64.AppImage - -# Create AppImage. -unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH -./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -bundle-non-qt-libs -no-translations - -if [ "$USE_WEBENGINE" = true ]; then - # Copy some NSS3 files to prevent WebEngine crashes. - cp /usr/lib/x86_64-linux-gnu/nss/* ./AppDir/usr/lib/ -v -fi - -./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -appimage -no-translations - -# Rename AppImaage. -set -- R*.AppImage - -rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi - -imagename="$1" -git_tag=$(git describe --tags `git rev-list --tags --max-count=1`) -git_revision=$(git rev-parse --short HEAD) - -if [ "$USE_WEBENGINE" = true ]; then - imagenewname="rssguard-${git_tag}-${git_revision}-linux64.AppImage" -else - imagenewname="rssguard-${git_tag}-${git_revision}-nowebengine-linux64.AppImage" -fi - -mv "$imagename" "$imagenewname" -ls \ No newline at end of file diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh deleted file mode 100755 index 09923c7bf..000000000 --- a/resources/scripts/.travis-install-osx.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -# Install Qt. This needs to be done here, because some -# variables need to be set. -QTPATH="$(pwd)/Qt" -QTVERSION="5.15.2" -QTBIN="$QTPATH/$QTVERSION/clang_64/bin" - -echo "Qt bin directory is: $QTBIN" -echo "Qt will be installed to: $QTPATH" - -aqt install -O "$QTPATH" 5.15.2 mac desktop clang_64 -m qtwebengine - -export QT_PLUGIN_PATH="$QTPATH/$QTVERSION/clang_64/plugins" -export PATH="$QTBIN:$PATH" - -qmake --version - -# Build application. -mkdir rssguard-build && cd rssguard-build -qmake .. "USE_WEBENGINE=$USE_WEBENGINE" -make -make install -cd "src/rssguard" - -# Fix .dylib linking. -install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" "RSS Guard.app/Contents/MacOS/rssguard" -install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" "rssguard" - -otool -L "RSS Guard.app/Contents/MacOS/rssguard" -macdeployqt "./RSS Guard.app" -dmg -#make dmg - -# Rename DMG. -set -- *.dmg - -rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi - -dmgname="$1" -git_tag=$(git describe --tags `git rev-list --tags --max-count=1`) -git_revision=$(git rev-parse --short HEAD) - -if [ "$USE_WEBENGINE" = true ]; then - dmgnewname="rssguard-${git_tag}-${git_revision}-mac64.dmg" -else - dmgnewname="rssguard-${git_tag}-${git_revision}-nowebengine-mac64.dmg" -fi - -mv "$dmgname" "$dmgnewname" -ls \ No newline at end of file