Cleanup travis

.travis.yml

@@ -18,8 +18,8 @@ deploy:
     skip_cleanup: true
     api_key: $GH_TOKEN
     file:
-    - rssguard-build/rss*.AppImage
+    - rssguard-build/src/rssguard/rss*.AppImage
-    - rssguard-build/rss*.dmg
+    - rssguard-build/src/rssguard/rss*.dmg
     on:
       tags: true
       all_branches: true
@@ -34,7 +34,7 @@ deploy:
 
 git:
   submodules: false
-  depth: 40
+  depth: 10
 before_install: "./resources/scripts/.travis-before-install.sh"
 install: true
 script:

resources/scripts/.travis-before-install.sh

@@ -15,10 +15,10 @@ if test "$TRAVIS_OS_NAME" = "osx"; then
 else
   # Linux.
   sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  sudo add-apt-repository ppa:beineri/opt-qt-5.12.2-xenial -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 qt512tools qt512base qt512webengine qt512svg
+  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 

resources/scripts/.travis-install-linux.sh

@@ -22,61 +22,3 @@ 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
 ./linuxdeployqt-continuous-x86_64.AppImage "./AppDir/usr/share/applications/com.github.rssguard.desktop" -appimage -no-translations
 
-# Upload image.
-git config --global user.email "rotter.martinos@gmail.com"
-git config --global user.name "martinrotter"
-git clone https://martinrotter:${GH_TOKEN}@github.com/martinrotter/rssguard.wiki.git ./build-wiki
-
-set -- R*.AppImage
-
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-
-imagename="$1"
-git_revision=$(git rev-parse --short HEAD)
-
-if [ "$USE_WEBENGINE" = true ]; then
-  imagenamenospace="rssguard-${git_revision}-linux64.AppImage"
-else
-  imagenamenospace="rssguard-${git_revision}-nowebengine-linux64.AppImage"
-fi
-
-mv "$imagename" "$imagenamenospace"
-imagename="$imagenamenospace"
-
-ls
-
-echo "File to upload: $imagename"
-echo "URL ending: $imagenamenospace"
-
-url=$(curl --upload-file "./$imagename" "https://transfer.sh/$imagenamenospace" --silent)
-
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-
-wikiline="| Linux | $(date +'%m-%d-%Y %T') | [$git_revision](https\://github.com/martinrotter/rssguard/commit/$git_revision) | [transfer.sh]($url) | $(echo "$USE_WEBENGINE") |  "
-wikifile="./build-wiki/Development-builds.md"
-wikifilenew="./build-wiki/Development-builds.md.new"
-
-echo "Line to add: $wikiline"
-cat "$wikifile" | sed -e "s@| Linux | .\+$USE_WEBENGINE |  @$wikiline@g" > "$wikifilenew"
-
-cat "$wikifilenew"
-mv "$wikifilenew" "$wikifile"
-
-ls
-cd ./build-wiki
-git commit -a -m "New files."
-git pull origin master
-git push origin master
-
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-
-echo "Current git commit hash is $(git rev-parse HEAD)."
-echo "Travis branch $TRAVIS_BRANCH and Travis tag $TRAVIS_TAG."
-
-if [[ $TRAVIS_BRANCH == $TRAVIS_TAG ]]; then
-#if [[ true ]]; then
-  # We will trigger stuff for Flathub.
-  cd ../..
-  chmod +x resources/scripts/.flathub-release.sh
-  resources/scripts/.flathub-release.sh $TRAVIS_TAG $(git rev-parse HEAD)
-fi

resources/scripts/.travis-install-osx.sh

@@ -11,42 +11,4 @@ make install
 # Make DMG image.
 cd "src/rssguard"
 make dmg
-otool -L "RSS Guard.app/Contents/MacOS/rssguard"
+otool -L "RSS Guard.app/Contents/MacOS/rssguard"
-
-set -- *.dmg
-dmgname="$1"
-git_revision=$(git rev-parse --short HEAD)
-
-if [ "$USE_WEBENGINE" = true ]; then
-  dmgnamenospace="rssguard-${git_revision}-mac64.dmg"
-else
-  dmgnamenospace="rssguard-${git_revision}-nowebengine-mac64.dmg"
-fi
-
-mv "$dmgname" "$dmgnamenospace"
-dmgname="$dmgnamenospace"
-
-echo "File to upload: $dmgname"
-echo "URL ending: $dmgnamenospace"
-
-git config --global user.email "rotter.martinos@gmail.com"
-git config --global user.name "martinrotter"
-git clone -q --depth=1 https://martinrotter:${GH_TOKEN}@github.com/martinrotter/rssguard.wiki.git ./build-wiki
-
-url=$(curl --upload-file "./$dmgname" "https://transfer.sh/$dmgnamenospace" --silent)
-
-wikiline="| Mac OS | $(date +'%m-%d-%Y %T') | [$git_revision](https\://github.com/martinrotter/rssguard/commit/$git_revision) | [transfer.sh]($url) | $(echo "$USE_WEBENGINE") |  "
-wikifile="./build-wiki/Development-builds.md"
-wikifilenew="./build-wiki/Development-builds.md.new"
-
-echo "Line to add: $wikiline"
-cat "$wikifile" | /usr/local/bin/gsed -e "s@| Mac OS | .\+$USE_WEBENGINE |  @$wikiline@g" > "$wikifilenew"
-
-cat "$wikifilenew"
-mv "$wikifilenew" "$wikifile"
-
-cd ./build-wiki
-git add *.*
-git commit -m "New files."
-git pull origin master
-git push origin master