Remove all travis/appveyor stuff, now dev. builds directly in RELEASES via github actions.
This commit is contained in:
parent
7957ce36d9
commit
5b7260e97d
9 changed files with 3 additions and 276 deletions
|
@ -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
|
|
|
@ -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
|
|
||||||
}
|
|
42
.travis.yml
42
.travis.yml
|
@ -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
|
|
|
@ -1,8 +1,6 @@
|
||||||
RSS Guard
|
RSS Guard
|
||||||
=========
|
=========
|
||||||
|
|
||||||
[](https://ci.appveyor.com/project/martinrotter/rssguard)
|
|
||||||
[](https://travis-ci.org/martinrotter/rssguard)
|
|
||||||
[](http://www.somsubhra.com/github-release-stats/?username=martinrotter&repository=rssguard&search=0)
|
[](http://www.somsubhra.com/github-release-stats/?username=martinrotter&repository=rssguard&search=0)
|
||||||
[](https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/text/CHANGELOG)
|
[](https://raw.githubusercontent.com/martinrotter/rssguard/master/resources/text/CHANGELOG)
|
||||||
[](https://repology.org/project/rssguard/versions)
|
[](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).
|
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).
|
Documentation is [here](https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md).
|
||||||
|
|
|
@ -9,7 +9,7 @@ Official downloads are available [here](https://github.com/martinrotter/rssguard
|
||||||

|

|
||||||
|
|
||||||
## Development builds
|
## 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
|
## 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:
|
**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
|
||||||
* `<platform>` = `win32` (This is the target platform which the application can run on.),
|
* `<platform>` = `win32` (This is the target platform which the application can run on.),
|
||||||
* `<fileformat>` = `exe` (This is self-explanatory.).
|
* `<fileformat>` = `exe` (This is self-explanatory.).
|
||||||
|
|
||||||
Note that same file naming scheme is used for auto-generated builds for Linux and Mac OS.
|
Note that same file naming scheme for development builds might be little different. Specifically, `<version>` field is omitted.
|
|
@ -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"
|
|
|
@ -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
|
|
|
@ -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
|
|
|
@ -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
|
|
Loading…
Add table
Reference in a new issue